chore: Update doc

.env.development

@@ -1 +1 @@
-VITE_GLOB_API_URL = 'https://test.bjtdba.com'
+VITE_GLOB_API_URL = 'https://app.bjtdba.com'

README.md

@@ -20,28 +20,28 @@ pnpm build:mp-weixin
 > 构建后，将生成 `dist/build/mp-wexin` 目录，在微信开发工具导入此目录，测试后提交发布即可
 
 ## 小程序功能清单
-- [ ] 首页
+- [x] 首页
   - [x] 签到(签到得积分)
   - [x] 搜索 `/pages/search/index`
   - [x] 城中大仓
   - [x] 限时秒杀
   - [x] 京东 `跳转至京东小程序`
   - [x] 滋补养生（动态数据请求） `/api/common/home_quick_link`,
-  - [ ] 拼多多
+  - [x] 拼多多
     - [x] 商品展示
-    - [ ] 小程序跳转
-  - [ ] 淘宝
+    - [x] 小程序跳转
+  - [x] 淘宝
     - [x] 商品购买跳转
-  - [ ] 抖音
-    - [ ] 抖音商品列表
+  - [x] 抖音
+    - [x] 抖音商品列表
     - [x] 抖音直播间
-  - [ ] 唯品会
+  - [x] 唯品会
     - [x] 唯品会内容列表
-    - [ ] 唯品会商品跳转
-  - [ ] 苏宁
+    - [x] 唯品会商品跳转
+  - [x] 苏宁
     - [x] 苏宁商品列表
-    - [ ] 苏宁商品跳转
-  - [ ] 消息
+    - [x] 苏宁商品跳转
+  - [x] 消息
   - [x] 限时秒杀
   - [x] 积分通兑 `/pages/product/integral`
   - [x] 老年、学生、会员、惠民
@@ -54,16 +54,15 @@ pnpm build:mp-weixin
 
 - [x] 大仓 `/pages/dacang/list/index`
 
-- [ ] 购物车 `/pages/order_addcart/index`
+- [x] 购物车 `/pages/order_addcart/index`
   - [x] 列表
-  - [ ] 结算
-    - [ ] 地址管理
+  - [x] 结算
+    - [x] 地址管理
 
-- [ ] 我的
+- [x] 我的
   - [x] 用户
   - [x] 个人资料
   - [x] 养老金 `/pages/annuity/index`
-    - [ ] 支付平台绑定 `/pages/third_party_binding/index`
     - [x] 养老金账户（我的养老金） `/pages/pension_account/index`
     - [x] 养老金记录 `/pages/pension_record/index`
       - [x] 电商平台养老金明细 `/pages/pension_choice_platform/index`
@@ -83,13 +82,13 @@ pnpm build:mp-weixin
     - [x] 积分明细 `/pages/my-integral/detail`
     - [x] 积分任务
       - [x] 每日签到 - 去签到
-      - [ ] 邀请好友得积分 - 去邀请
-        - [ ] 海报
-  - [ ] 红积分提现
+      - [x] 邀请好友得积分 - 去邀请
+        - [x] 海报
+  - [x] 红积分提现
     - [x] 复购增加红积分
-    - [ ] 提现
+    - [x] 提现
       - [x] 提现页
-      - [ ] 接口验证
+      - [x] 接口验证
   - [x] 团队人数
   - [x] 我的订单 - 查看全部 `/pages/order/index`
     - [x] 待付款
@@ -108,26 +107,23 @@ pnpm build:mp-weixin
   - [x] 我的评价 `/pages/my-reply/index`
   - [x] 邀请好友 `/pages/invite-friends/index`
   - [x] 商铺入驻 (小程序跳转)
-  - [ ] 帮扶中心 `/pages/bangfuzhongxin/index`
+  - [x] 帮扶中心 `/pages/bangfuzhongxin/index`
     - [ ] 立即升级（待测试）
   - [x] 设置
     - [x] 反馈回复 `/pages/feedback/index`
     - [x] 关于我们 `/pages/user/about/index`
-    - [ ] 版本更新 `/pages/version-update/index`
-    - [ ] 实名认证 (接口待对接)
+    - [x] 版本更新 `/pages/version-update/index`
+    - [x] 实名认证
       - `/pages/real-name-authentication/index` 未实名
       - `/pages/already-realname/index` 已实名
-    - [ ] 三方账号绑定 `/pages/third_party_binding/index`
-      - [ ] 微信授权
-      - [ ] 支付宝授权（无法实现）
+    - [x] 三方账号绑定 `/pages/third_party_binding/index`
+      - [x] 微信授权
+      - [x] 支付宝授权（无法实现）
     - [ ] 个性化选项 `/pages/personalization-options/index`(接口未对接)
     - [x] 服务协议 `/pages/webview/agreement?type=2`
     - [x] 隐私协议 `/pages/webview/agreement?type=1`
-    - [ ] 账号注销 (接口未对接)
+    - [x] 账号注销
     - [x] 退出登录
 
 
-登录 退出 商品展示 、购买、收益
-
-
 ciyid 要传，不然出现请选择正确地址异常

src/components/ProductCard/ProductCard.vue

@@ -40,9 +40,11 @@ function handleClick() {
     <image :src="item.thumb" mode="widthFix" :fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 6"></image>
 
     <div class="text-sm p-2 flex flex-col gap-1">
-      <div v-if="item.type == 5" class="line-clamp-2" v-html="item.store_name">
+      <div v-if="item.type == 5" class="line-clamp-2">
+        {{ item.store_name }}
       </div>
-      <div v-if="item.type == 6" class="line-clamp-2" v-html="item.name">
+      <div v-if="item.type == 6" class="line-clamp-2">
+        {{ item.name }}
       </div>
       <div class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
         <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"

src/pages/my-rules/index.vue

@@ -16,9 +16,78 @@ const ruleDetail = ref<{
   title: string
 }>()
 
+const currentType = ref<any>([])
+
 const showUpgradeInfo = ref(false)
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
+  // console.log(userStore.userInfo)
+  const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
+  // 创始人
+  if (userRichType == 3) {
+    if (bangfu) {
+      return ['创始人', bangfu]
+    }
+    return ['创始人']
+    // return [].push()
+  }
+  // 普通用户
+  if (userRichType == 0) {
+    if (bangfu) {
+      return ['用户', bangfu]
+    }
+    return ['用户']
+  }
+  // 会员
+  if (userRichType == 1) {
+    if (bangfu) {
+      return ['会员', bangfu]
+    }
+    return ['会员']
+
+  }
+  if (userRichType == 3) {
+    if (bangfu) {
+      return ['创始人', bangfu]
+    }
+    return ['创始人']
+  }
+  // 合伙人
+  if (userRichType == 4) {
+    // return '高级会员'
+    if (bangfu) {
+      return ['VIP', bangfu]
+    }
+    return ['VIP']
+  }
+  if (userRichType == 5) {
+    if (bangfu) {
+      return ['初始级合伙人', bangfu]
+    }
+    return ['初始级合伙人']
+  }
+  if (userRichType == 6) {
+    if (bangfu) {
+      return ['中级合伙人', bangfu]
+    }
+    return ['中级合伙人']
+  }
+  if (userRichType == 7) {
+    if (bangfu) {
+      return ['高级合伙人', bangfu]
+    }
+    return ['高级合伙人']
+  }
+  if (!userRichType) {
+    if (bangfu) {
+      return ['用户', bangfu]
+    }
+    return ['用户']
+  }
+})
+/*
+const userType = computed(() => {
+  const userRichType = userStore.userInfo?.user_rich_type
 
   // 创始人
   if (userRichType == 3) {
@@ -53,10 +122,16 @@ const userType = computed(() => {
     return '用户'
   }
 })
+*/
 
 
-
-onLoad(async () => {
+onLoad(async (option) => {
+  // console.log(option)
+  if (option && option.userType) {
+    currentType.value = [option.userType]
+  } else {
+    currentType.value = userType
+  }
   await userStore.getUserInfo()
   await userStore.getUserYanglaoJin()
 })
@@ -91,7 +166,7 @@ function handleShowAnnuityDetail() {
 const ruleId = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
 
-  console.log(userRichType)
+  // console.log(userRichType)
   // 创始人
   if (userRichType === 3) {
     return 21
@@ -116,7 +191,7 @@ const agentInfo = ref({})
 onShow(() => {
 
   if (ruleId.value) {
-    console.log(ruleId.value)
+    // console.log(ruleId.value)
     getRules(ruleId.value).then(res => {
       ruleDetail.value = res
     }).catch(error => {
@@ -170,10 +245,18 @@ function handleToVipPage() {
                 {{ encodePhone(userStore.userInfo.phone) }}
               </div>
             </div>
-            <div
-                class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
-              {{ userType }}
+            <div class="flex gap-1 items-center px-1">
+              <div
+                  v-for="(item, index) in currentType"
+                  :key="index"
+                  class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
+                {{ item }}
+              </div>
             </div>
+<!--            <div-->
+<!--                class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">-->
+<!--              {{ userType }}-->
+<!--            </div>-->
           </div>
 
 
@@ -231,7 +314,7 @@ function handleToVipPage() {
           v-else
           class="p-3 bg-white text-sm text-gray-500"
       >
-        <mpHtml :content="ruleDetail.content"></mpHtml>
+        <mpHtml :content="ruleDetail.content" v-if="ruleDetail && ruleDetail.content"></mpHtml>
 
         <div class="flex justify-center items-center">
           <nut-button

src/pages/order/components/OtherOrderItem.vue

@@ -54,6 +54,8 @@ function handleClick() {
   console.log(product)
   // if (product.source == '6') {
   const productId = props.item.source == '1' ? product.goods_sign : product.goods_id
+  // console.log(productId)
+  console.log(product.commission)
   navigateToDetail(encodeBase64({
     platform: product.source,
     // id: product.goods_id,

src/pages/store/product/other.vue

@@ -3,7 +3,7 @@
 import {
   getDyProductDetail,
   getJdProductDetail,
-  getPddProductDetail,
+  getPddProductDetail, getShareId,
   getSuProductDetail,
   getTaobaoProductDetail,
   getVipProductDetail
@@ -51,7 +51,8 @@ const props = defineProps({
 })
 
 const state = reactive({
-  data: {}
+  data: {},
+  shareId: ''
 })
 const detail = ref<IProductDetail>()
 onLoad((options: any) => {
@@ -71,11 +72,15 @@ onShow(() => {
   isSubmit.value = false
 })
 
+
+
 function mergeProductDetail(data: Partial<IProductDetail> = {}) {
   detail.value = merge(detail.value, data)
 }
 
 function loadProductDetail(product: Partial<IProductDetail>) {
+  // console.log('产品id')
+  // console.log(product.id)
   // 京东
   if (product.platform == 6) {
     getJdProductDetail(product.id).then(res => {
@@ -151,7 +156,8 @@ function loadProductDetail(product: Partial<IProductDetail>) {
         featured: product.goodsCarouselPictures,
         images: product.goodsDetailPictures,
         mallName: '唯品自营',
-        ...product
+        ...product,
+        ...res
       })
       if (product.couponInfo) {
         mergeProductDetail({
@@ -315,6 +321,60 @@ function handleBuyNow() {
   if (detail.value?.platform == 2) {
     console.log(detail.value)
   }*/
+
+  onShareAppMessage(async () => {
+    await uni.showLoading({
+      title: '分享中',
+      icon: 'none'
+    })
+    return await getShareId({ pid: state.id, type: 1 }).then(res => {
+      if (res) {
+        state.shareId = res.share_id
+        uni.hideLoading()
+        return {
+          title: `${detail.value.title}`,
+          path: `pages/store/product/detail?id=${detail.value.id}&from=share&shareID=${state.shareId}`
+        }
+      }
+    }).catch(error => {
+      uni.showToast({
+        title: '请登录后分享',
+        icon: 'none'
+      }).then(() => {
+        setTimeout(() => {
+          uni.navigateTo({
+            url: '/pages/user/login/index'
+          })
+        }, 500)
+      })
+      uni.hideLoading()
+    })
+
+  })
+
+  onShareTimeline(() => {
+
+    if (!userStore.uid) {
+      return uni.showToast({
+        title: '请登录后分享',
+        icon: 'none'
+      }).then(() => {
+        setTimeout(() => {
+          uni.navigateTo({
+            url: '/pages/user/login/index'
+          })
+        }, 500)
+      })
+    }
+
+    return {
+      title: `${detail.value.store_name}`,
+      imageUrl:  state.shareImage,
+      query: `id=${state.id}&from=share&shareID=${state.shareId}`
+    }
+
+  })
+
 }
 
 /**
@@ -401,7 +461,7 @@ const hasCoupon = computed(() => {
           <div class="flex justify-between items-center p-3">
             <div class="inline-flex items-center">
               <div class="text-sm">预估养老金</div>
-              <FPrice :price="detail.allowance" need-symbol ex-class="text-[20px] font-bold"/>
+              <FPrice :price="detail.yanglao || detail.commission" need-symbol ex-class="text-[20px] font-bold"/>
             </div>
             <div>
               <nut-button type="primary" @tap="handleBuyNow" :disabled="isSubmit">

src/pages/user/index.vue

@@ -8,7 +8,7 @@ import {totalOrderNumber} from "~/apis/order.api";
 import type {OrderQuantityModel} from "~/apis/model/order.model";
 import type {Ref} from "vue";
 const pageStore = usePageStoreWidthOut()
-
+const currentType = ref('')
 const myOrderList = [{
   id: 'noPay',
   icon: CDN_URL + '/static/assets/obligation_220620.png',
@@ -333,9 +333,9 @@ function handleShowMyProfile() {
   })
 }
 
-function handleShowMyRulePage() {
+function handleShowMyRulePage(item) {
   uni.navigateTo({
-    url: '/pages/my-rules/index'
+    url: `/pages/my-rules/index?userType=${item}`
   })
 }
 </script>
@@ -372,7 +372,7 @@ function handleShowMyRulePage() {
             <div
                 v-for="(item, index) in userType"
                 :key="index"
-                @click="handleShowMyRulePage"
+                @click="handleShowMyRulePage(item)"
                 class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
               {{ item }}
             </div>

src/utils/http/pdd.json

@@ -1,303 +0,0 @@
-{
-  "status": 200,
-  "message": "success",
-  "data": {
-    "product_id": "3815",
-    "mer_id": "321",
-    "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2022-11-23\/c33e4202211231534327512.png",
-    "slider_image": [
-      "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2022-11-23\/c33e4202211231534327512.png"
-    ],
-    "store_name": "给赵姐安排的多规格商品~~",
-    "store_info": "温和清洁水油平衡专注偏油细软发质养护",
-    "unit_name": "瓶",
-    "price": "1.00",
-    "cost": "0.00",
-    "ot_price": "10.00",
-    "stock": "1331",
-    "sales": 101,
-    "video_link": "",
-    "product_type": "0",
-    "type": "5",
-    "dc_price": "0.00",
-    "seckill": "0",
-    "isRelation": false,
-    "sku": {
-      "紫色,01": {
-        "sku": "紫色,01",
-        "price": "9.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "1d2a62fa63a0",
-        "dacang": "0.00"
-      },
-      "紫色,02": {
-        "sku": "紫色,02",
-        "price": "10.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "15ce35afbc60",
-        "dacang": "0.00"
-      },
-      "紫色,03": {
-        "sku": "紫色,03",
-        "price": "11.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "c842679d28f0",
-        "dacang": "0.00"
-      },
-      "紫色,04": {
-        "sku": "紫色,04",
-        "price": "12.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "023642eb20a0",
-        "dacang": "0.00"
-      },
-      "绿色,01": {
-        "sku": "绿色,01",
-        "price": "5.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "e42da891b7a0",
-        "dacang": "0.00"
-      },
-      "绿色,02": {
-        "sku": "绿色,02",
-        "price": "6.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "05b9255af420",
-        "dacang": "0.00"
-      },
-      "绿色,03": {
-        "sku": "绿色,03",
-        "price": "7.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "a29158286450",
-        "dacang": "0.00"
-      },
-      "绿色,04": {
-        "sku": "绿色,04",
-        "price": "8.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "644969326fb0",
-        "dacang": "0.00"
-      },
-      "黄色,01": {
-        "sku": "黄色,01",
-        "price": "1.00",
-        "stock": "110",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "cc0d65f6c620",
-        "dacang": "0.00"
-      },
-      "黄色,02": {
-        "sku": "黄色,02",
-        "price": "2.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "1bd652581f90",
-        "dacang": "0.00"
-      },
-      "黄色,03": {
-        "sku": "黄色,03",
-        "price": "3.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "e7a1d45c0410",
-        "dacang": "0.00"
-      },
-      "黄色,04": {
-        "sku": "黄色,04",
-        "price": "4.00",
-        "stock": "111",
-        "image": "",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "10.00",
-        "unique": "9c3b14543f50",
-        "dacang": "0.00"
-      }
-    },
-    "replayData": {
-      "best": 0,
-      "rate": "",
-      "count": 0
-    },
-    "unique": "cc0d65f6c620",
-    "attr": [
-      {
-        "product_id": "3815",
-        "attr_name": "颜色",
-        "attr_values": [
-          "黄色",
-          "绿色",
-          "紫色"
-        ],
-        "type": "0",
-        "attr_id": null,
-        "attr_value": [
-          {
-            "attr": "黄色",
-            "check": false
-          },
-          {
-            "attr": "绿色",
-            "check": false
-          },
-          {
-            "attr": "紫色",
-            "check": false
-          }
-        ]
-      },
-      {
-        "product_id": "3815",
-        "attr_name": "型号",
-        "attr_values": [
-          "01",
-          "02",
-          "03",
-          "04"
-        ],
-        "type": "0",
-        "attr_id": null,
-        "attr_value": [
-          {
-            "attr": "01",
-            "check": false
-          },
-          {
-            "attr": "02",
-            "check": false
-          },
-          {
-            "attr": "03",
-            "check": false
-          },
-          {
-            "attr": "04",
-            "check": false
-          }
-        ]
-      }
-    ],
-    "yanglao": "0.05",
-    "product_count": 89,
-    "merchant_type": "3",
-    "seckill_s": 0,
-    "content": {
-      "product_id": "3815",
-      "content": "<p><br\/><\/p><p><img src=\"https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2022-11-23\/6dff6202211231536166470.jpg\"\/><\/p>",
-      "type": "0"
-    },
-    "topReply": null,
-    "merchant": {
-      "mer_id": "321",
-      "mer_name": "大仓创客",
-      "mer_avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20220428\/d616961db8aefbe92f72972a1d7db88a.png",
-      "product_score": "3.8",
-      "service_score": "3.6",
-      "postage_score": "3.6",
-      "service_phone": "13260336036",
-      "care_count": "11",
-      "business_id": "0",
-      "sxy_submerchant_id": "895152791",
-      "im": {
-        "im": "0",
-        "im_uuid": null,
-        "account": "12222222222"
-      },
-      "recommend": [
-        {
-          "mer_id": "321",
-          "product_id": "6145",
-          "store_name": "海谜璃牛皮女包水桶包复古女大包斜跨包HBB0106",
-          "image": "https:\/\/scce-cos-prd.obs.cn-south-1.myhuaweicloud.com:443\/dc9da00050c14c76ac869707d7ddb84e.jpg",
-          "price": "415.87",
-          "is_show": "1",
-          "status": "1",
-          "is_gift_bag": "0",
-          "is_good": "0",
-          "ot_price": "439.00",
-          "yanglao": "9.45"
-        },
-        {
-          "mer_id": "321",
-          "product_id": "6147",
-          "store_name": "viney牛皮包包女包斜挎包女轻奢链条包简约感单肩小包百搭小众小方包品牌高级感生日礼物送女友老婆女朋友实用",
-          "image": "https:\/\/img13.360buyimg.com\/n12\/jfs\/t1\/159949\/15\/21639\/475015\/63fb76f4Fc756c6ae\/a5a3a097b3702556.png",
-          "price": "267.82",
-          "is_show": "1",
-          "status": "1",
-          "is_gift_bag": "0",
-          "is_good": "0",
-          "ot_price": "284.90",
-          "yanglao": "6.08"
-        },
-        {
-          "mer_id": "321",
-          "product_id": "3857",
-          "store_name": "白酒",
-          "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2022-11-29\/55569202211291710338893.png",
-          "price": "1.00",
-          "is_show": "1",
-          "status": "1",
-          "is_gift_bag": "0",
-          "is_good": "0",
-          "ot_price": "2.00",
-          "yanglao": "0.05"
-        }
-      ]
-    }
-  }
-}