feat: share_id

src/apis/auth.api.ts

@@ -52,7 +52,8 @@ export function authVerify(phone: string) {
  */
 export function authSmsLogin(params: {
     phone: string,
-    sms_code: string
+    sms_code: string,
+    share_id?: string
 }): Promise<LoginModel> {
     return defHttp.post({
         url: API.AUTH_SMS_LOGIN,

src/apis/order.api.ts

@@ -23,6 +23,7 @@ export interface CreateOrderRequest {
     dacang_id: string//大仓id
     pay_type: string//支付方式：0: 余额: string1: 微信: string2: 小程序: string4: 支付宝: string5: 特殊商户积分
     mer_id: string//商户id
+    share_id: string
 }
 
 enum API {

src/apis/product.ts

@@ -71,6 +71,18 @@ enum API {
 }
 
 /**
+ * 获取分享ID
+ * @param params
+ */
+export function getShareId(params: { pid: string, type: 1}): Promise<{ url: string, share_id: string}>{
+    return defHttp.get({
+        url: API.PRODUCT_SHARE,
+        data: {
+            ...params
+        }
+    })
+}
+/**
  * 商品详情
  * @param product_id
  */

src/apis/user.ts

@@ -810,7 +810,8 @@ export function wechatCheck(openid: string): Promise<{ token: string, exp: numbe
 export function authAppletPhone(params: {
     sessionKey: string,
     encryptedData: string,
-    iv: string
+    iv: string,
+    share_id?: string
 }): Promise<{ token: string, exp: number, user: any }> {
     return defHttp.post({
         url: API.AUTH_APPLET_PHONE,

src/components/CXBDialogSignIn/CXBDialogSIgnIn.vue

@@ -129,7 +129,7 @@ function handleSignInSucceedClose() {
       <image :src="bgImage" mode="widthFix"
              class="absolute "
       ></image>
-      <div class="flex flex-col justify-around items-center relative top-10 gap-3 ">
+      <div class="flex flex-col justify-around items-center relative top-10 gap-3 w-75 h-75">
         <div class="flex gap-2 justify-center items-center mb-4 p-2" v-if="props.day <=6 ">
           <template v-if="props.day > 0">
 
@@ -152,8 +152,31 @@ function handleSignInSucceedClose() {
         </div>
         <div class=" px-4 flex mb-4 ">
           <div class="flex gap-3 ">
+
+            <tempalte v-if="props.day in [7, 14, 21, 30]">
+            <SignInGiftBag
+                v-if="props.day == 7"
+                :day="7"
+                :text="'已签'"
+            />
             <SignInGiftBag
-                v-for="item in [7, 14, 21, 30]"
+                v-else-if="props.day == 14"
+                :day="props.day"
+                :text="'已签'"
+            />
+            <SignInGiftBag
+                v-else-if="props.day == 21"
+                :day="props.day"
+                :text="'已签'"
+            />
+            <SignInGiftBag
+                v-else-if="props.day == 30"
+                :day="props.day"
+                :text="'已签'"
+            />
+            </tempalte>
+            <SignInGiftBag
+                v-for="item in [7, 14, 21, 30].filter((val) => val != props.day)"
                 :key="item"
                 :day="item"
             />
@@ -165,7 +188,7 @@ function handleSignInSucceedClose() {
             @click.stop="confirmHandler"
             class="relative h-13 flex justify-center items-center">
           <image :src="signInBtnImage" mode="widthFix"
-                 class="absolute w-45"></image>
+                 class="absolute w-45 h-30"></image>
           <div class="relative flex w-full text-white top--1.5">
             <div>立即签到</div>
             <div class="text-[#ffe980]">{{ signInFor }}</div>
@@ -189,4 +212,13 @@ function handleSignInSucceedClose() {
   </FOverlay>
   <CXBDialogSIgnInSucceed :show="signInSuccess" @close="handleSignInSucceedClose"/>
 
-</template>
+</template>
+
+<style>
+.signButtonBg {
+  width: 435rpx;
+  height: 124rpx;
+  background-image: url('https://cdn.bjtdba.com/chuxubao/static/assets/sign_in_button.png');
+  background-size: 100% 100%;
+}
+</style>

src/components/CXBDialogSignIn/SignInGiftBag.vue

@@ -18,6 +18,9 @@ const props = defineProps({
   day: {
     type: Number,
     required: true
+  },
+  text: {
+    type: String,
   }
 })
 const cIntegral = computed(() => {
@@ -51,13 +54,15 @@ const cIntegral = computed(() => {
         <div class="!bg-white p-2 relative rounded-t">
           <image :src="bgImg"
                  mode="widthFix"
-                 class="relative w-10"
+                 class="relative w-10 h-10"
           ></image>
         </div>
 
         <div class="relative text-[11px] mb-1 bg-[#feeae9] w-full rounded-b text-center">+{{ cIntegral }}</div>
       </div>
-      <div class="relative text-[10px]">第 {{day}} 天</div>
+<!--      <div class="relative text-[10px]">第 {{day}} 天</div>-->
+      <div class="relative text-[10px]" v-if="text"> {{ text}} </div>
+      <div class="relative text-[10px]" v-else> 第 {{ day }} 天</div>
     </div>
   </div>
 

src/components/CXBDialogSignIn/SignRedPacket.vue

@@ -31,13 +31,13 @@ const getScore =computed(() => {
 <template>
    <div class=" flex flex-col   items-center  text-xs gap-2" >
         <div class=" flex flex-col items-center justify-end "
-             :class="text ? 'activeBg' : 'defaultBg'"
+             :class="[text ? 'activeBg' : 'defaultBg', 'h-29 w-20']"
         >
           <div class="text-[11px] text-white mb-1">{{ getScore }}</div>
         </div>
         <div>
           <div class="relative text-[10px]" v-if="text"> {{ text}} </div>
-          <div class="relative text-[10px]" v-else> 第 {{ props.day }} 天</div>
+          <div class="relative text-[10px]" v-else> 第 {{ day }} 天</div>
         </div>
 
       </div>

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import {authAppletPhone, bindPhone, getUserUnionId} from "~/apis/user";
 import {useUserStore} from "~/stores/userStore";
+import Cache from "~/utils/cache";
 const userStore = useUserStore()
 const props = defineProps({
   text: {
@@ -23,11 +24,20 @@ function getPhoneNumber(e) {
           code: result.code,
           source,
         }).then(unionRes => {
-          // 手机号授权
-          authAppletPhone({
+          // getShareId(shareI)
+          const shareId = Cache.get('SHARE_ID')
+
+          let params = {
             sessionKey: unionRes.session_key,
             encryptedData: e.detail.encryptedData,
-            iv: e.detail.iv
+            iv: e.detail.iv,
+          }
+          if (shareId) {
+            params.share_id = shareId
+          }
+          // 手机号授权
+          authAppletPhone({
+            ...params
           }).then(authRes => {
             userStore.login(authRes.token, authRes.exp)
             userStore.setUID(authRes.user.uid)
@@ -42,9 +52,9 @@ function getPhoneNumber(e) {
               third_user_id: unionRes.unionid,
               type: 1
             }).then(bindRes => {
-              console.log('已绑定手机')
-              console.log(bindRes)
-
+              // console.log('已绑定手机')
+              // console.log(bindRes)
+              Cache.clear('SHARE_ID')
               // 跳转
               switch (props.key) {
                 case '10':

src/pages/my-reply/test.json

@@ -1,55 +1,626 @@
 {
   "status": 200,
   "message": "success",
-  "data": {
-    "count": 2,
-    "list": [
-      {
-        "reply_id": "131",
-        "uid": "395",
-        "mer_id": "323",
-        "order_product_id": "3188",
-        "unique": null,
-        "product_id": "1296",
-        "product_type": "0",
-        "product_score": "4",
-        "service_score": "3",
-        "postage_score": "3",
-        "rate": "3.3",
-        "comment": "dd",
-        "pics": "",
-        "create_time": "2023-09-22 10:39:39",
-        "merchant_reply_content": null,
-        "merchant_reply_time": null,
-        "is_del": "0",
-        "is_reply": "0",
-        "is_virtual": "0",
-        "nickname": "炸",
-        "avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20210425\/d63bd2aeace508eb83b6fe9194d704b0.png"
-      },
-      {
-        "reply_id": "133",
-        "uid": "395",
-        "mer_id": "322",
-        "order_product_id": "3031",
-        "unique": null,
-        "product_id": "1637",
-        "product_type": "0",
-        "product_score": "5",
-        "service_score": "5",
-        "postage_score": "5",
-        "rate": "5.0",
-        "comment": "很好，不错，值得推荐",
-        "pics": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-09-22\/9c637202309221100057712.png",
-        "create_time": "2023-09-22 11:00:10",
-        "merchant_reply_content": null,
-        "merchant_reply_time": null,
-        "is_del": "0",
-        "is_reply": "0",
-        "is_virtual": "0",
-        "nickname": "炸",
-        "avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20210425\/d63bd2aeace508eb83b6fe9194d704b0.png"
-      }
-    ]
-  }
+  "data": [
+    {
+      "product_id": "10995",
+      "mer_id": "321",
+      "image": "https:\/\/img13.360buyimg.com\/n12\/jfs\/t1\/92942\/7\/38275\/94380\/64795fffF30424bfb\/5ff47690551d593a.jpg",
+      "slider_image": "https:\/\/img13.360buyimg.com\/n12\/jfs\/t1\/92942\/7\/38275\/94380\/64795fffF30424bfb\/5ff47690551d593a.jpg",
+      "store_name": "I&W CARNIVAL HWGUOJI瑞士品牌名表女士手表全自动机械表商务防水时尚女表钢带进口机芯",
+      "store_info": "1",
+      "keyword": "I&W",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "0",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "1",
+      "price": "1072.06",
+      "cost": "974.60",
+      "ot_price": "1198.00",
+      "stock": "999",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "1",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:14",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "5176",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "100017595909",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "48.73",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "24.36",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10994",
+      "mer_id": "321",
+      "image": "https:\/\/oss-hxq-prod.szbaoly.com\/bjsc\/goods\/3700ae327b1a4dd1a638791d62d0113d.jpg",
+      "slider_image": "https:\/\/oss-hxq-prod.szbaoly.com\/bjsc\/goods\/3700ae327b1a4dd1a638791d62d0113d.jpg",
+      "store_name": "瑞士宾爵手表钟表白面黑带真皮防水气质配饰女表B1220L",
+      "store_info": "1",
+      "keyword": "瑞士宾",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "0",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "0",
+      "price": "236.91",
+      "cost": "215.38",
+      "ot_price": "1299.00",
+      "stock": "1000",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "0",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:14",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "5175",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "4-V1490NK4",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "10.76",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "5.38",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10993",
+      "mer_id": "321",
+      "image": "https:\/\/img.funengscm.com\/19aaa6d49b229fe82e4bc45c6b20140f",
+      "slider_image": "https:\/\/img.funengscm.com\/19aaa6d49b229fe82e4bc45c6b20140f",
+      "store_name": "阿玛尼银色满天星镶钻女表AR1925",
+      "store_info": "1",
+      "keyword": "阿玛尼",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "0",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "0",
+      "price": "785.29",
+      "cost": "713.90",
+      "ot_price": "3250.00",
+      "stock": "1000",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "0",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:14",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "5174",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "10-8J6KLUET",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "35.69",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "17.84",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10991",
+      "mer_id": "321",
+      "image": "https:\/\/img.funengscm.com\/4e06045193c1b52ac98f412c5fb76d8f",
+      "slider_image": "https:\/\/img.funengscm.com\/4e06045193c1b52ac98f412c5fb76d8f",
+      "store_name": "【拍一发二】食品保鲜袋加厚点断式保鲜袋",
+      "store_info": "1",
+      "keyword": "【拍一",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "567",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "0",
+      "price": "9.31",
+      "cost": "8.47",
+      "ot_price": "19.00",
+      "stock": "1000",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "1",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:14",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "693",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "10-BPNIGF2D",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "0.42",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "0.21",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10892",
+      "mer_id": "321",
+      "image": "https:\/\/cbu01.alicdn.com\/img\/ibank\/2019\/987\/163\/11040361789_1908962462.jpg",
+      "slider_image": "https:\/\/cbu01.alicdn.com\/img\/ibank\/2019\/987\/163\/11040361789_1908962462.jpg",
+      "store_name": "劲波王2800吹风筒机发廊专业大功率家用电吹风机",
+      "store_info": "1",
+      "keyword": "劲波王",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "0",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "0",
+      "price": "43.56",
+      "cost": "39.60",
+      "ot_price": "56.88",
+      "stock": "1000",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "0",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:09",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "5074",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "12-674-EVDELH9F",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "1.98",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "0.99",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10879",
+      "mer_id": "321",
+      "image": "https:\/\/img.funengscm.com\/e2407730e64351a6aa181279aed688f4",
+      "slider_image": "https:\/\/img.funengscm.com\/e2407730e64351a6aa181279aed688f4",
+      "store_name": "HX-361893浣馨内衣洗衣液300ml-2瓶装",
+      "store_info": "1",
+      "keyword": "HX-",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "0",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "0",
+      "price": "8.38",
+      "cost": "7.62",
+      "ot_price": "19.90",
+      "stock": "1000",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "0",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:08",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "5061",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "F349804944036986880",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "0.38",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "0.19",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10878",
+      "mer_id": "321",
+      "image": "https:\/\/img.funengscm.com\/edbb0d0a1a4fd0cba83845297abbaaef",
+      "slider_image": "https:\/\/img.funengscm.com\/edbb0d0a1a4fd0cba83845297abbaaef",
+      "store_name": "LP-364146蓝漂内衣洗衣乳500ml-1瓶",
+      "store_info": "1",
+      "keyword": "LP-",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "0",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "0",
+      "price": "7.98",
+      "cost": "7.26",
+      "ot_price": "9.90",
+      "stock": "1000",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "0",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:08",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "5060",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "F349804302664990720",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "0.36",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "0.18",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10877",
+      "mer_id": "321",
+      "image": "https:\/\/img.funengscm.com\/7cfe21040d52b4a8d996deaa05d03985",
+      "slider_image": "https:\/\/img.funengscm.com\/7cfe21040d52b4a8d996deaa05d03985",
+      "store_name": "361107蓝漂全效洗衣液500G-3袋",
+      "store_info": "1",
+      "keyword": "361",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "567",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "1",
+      "price": "9.04",
+      "cost": "8.22",
+      "ot_price": "9.90",
+      "stock": "999",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "0",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:08",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "714",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "F349800779290247168",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "0.41",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "0.20",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10876",
+      "mer_id": "321",
+      "image": "https:\/\/img.funengscm.com\/736d5f2fa33bed2fd8f9274fcd0a1843",
+      "slider_image": "https:\/\/img.funengscm.com\/736d5f2fa33bed2fd8f9274fcd0a1843",
+      "store_name": "LP-362036蓝漂内衣皂2个",
+      "store_info": "1",
+      "keyword": "LP-",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "567",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "1",
+      "price": "6.46",
+      "cost": "5.88",
+      "ot_price": "9.90",
+      "stock": "999",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "0",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:08",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "705",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "F349779474465685504",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "0.29",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "0.14",
+      "da_cang_price": "0.00"
+    },
+    {
+      "product_id": "10875",
+      "mer_id": "321",
+      "image": "https:\/\/img.yunzhonghe.com\/image\/1593677161572OSovUMPspP.jpg",
+      "slider_image": "https:\/\/img.yunzhonghe.com\/image\/1593677161572OSovUMPspP.jpg",
+      "store_name": "和正颈椎按摩枕（普通款无震动）HZ-JAZ-2 图片色 图片色",
+      "store_info": "1",
+      "keyword": "和正颈",
+      "bar_code": "",
+      "brand_id": null,
+      "is_show": "1",
+      "status": "1",
+      "is_del": "0",
+      "cate_id": "0",
+      "unit_name": "个",
+      "sort": "0",
+      "rank": "0",
+      "sales": "0",
+      "price": "52.70",
+      "cost": "47.91",
+      "ot_price": "149.00",
+      "stock": "1000",
+      "is_hot": "0",
+      "is_benefit": "0",
+      "is_best": "0",
+      "is_new": "0",
+      "is_good": "0",
+      "product_type": "0",
+      "ficti": "100",
+      "browse": "0",
+      "code_path": "",
+      "video_link": "",
+      "temp_id": "105",
+      "spec_type": "0",
+      "extension_type": "1",
+      "refusal": null,
+      "rate": "5",
+      "reply_count": "0",
+      "mer_status": "1",
+      "give_coupon_ids": null,
+      "is_gift_bag": "0",
+      "create_time": "2023-09-15 01:20:08",
+      "care_count": null,
+      "is_used": "1",
+      "old_product_id": "5059",
+      "volunteer": "0",
+      "type": "5",
+      "pension": "0.00",
+      "commission": "5",
+      "dc_id": "0",
+      "dc_price": null,
+      "seckill": "0",
+      "is_hide": "0",
+      "spu_id": "YZH1125899906849260",
+      "cost_price": null,
+      "gong_sku_id": null,
+      "plate_mer_profit": "2.39",
+      "yanglaojin_scale": "0.02",
+      "flag": "1",
+      "yanglao": "1.19",
+      "da_cang_price": "0.00"
+    }
+  ]
 }

src/pages/order-confirm/index.vue

@@ -152,7 +152,7 @@ function handleSubmit() {
     // 用户留言
     mark: data.mark,
     // take: [],
-    // share_id: '',
+    share_id: '1',
     // dacang_id:
     // distribution_address: ''
     // distribution_mode: ''

src/pages/order/components/OtherOrderItem.vue

@@ -100,7 +100,7 @@ function handleClick() {
       <div class="flex justify-center items-center gap-2">
         <div class="flex items-center">
           预估养老金：
-          <FPrice :price="item.yanlao"></FPrice>
+          <FPrice :price="item.yanglao"></FPrice>
         </div>
         <div class="border border-solid border-1px border-gray-500 text-gray rounded px-1">{{ item.status_name }}</div>
       </div>

src/pages/order/third-order-temp.vue

@@ -30,7 +30,7 @@
               <div class="flex justify-between text-[11px] items-center">
                 <div>{{ item.create_time }}</div>
                 <div class="flex justify-center items-center">
-                  预估养老金：<FPrice :price="item.yanlao"></FPrice>
+                  预估养老金：<FPrice :price="item.yanglao"></FPrice>
                   <div class="border border-solid border-1px border-gray-500 text-gray rounded">{{ item.status_name }}</div>
                 </div>
               </div>

src/pages/search/index.vue

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {
   getDyLiveList,
   getDyProductList,
@@ -11,7 +10,8 @@ import {
   searchDyProduct,
   searchJdProduct,
   searchPddProduct,
-  searchSuProduct, searchVipProduct
+  searchSuProduct,
+  searchVipProduct
 } from "~/apis/product";
 import type {
   DyProductModel,
@@ -670,7 +670,7 @@ onReachBottom(() => {
                          mode="widthFix" class="!w-8.5"></image>
                   <div class="px-2 flex items-center jusitify-center text-xs">
                     <div>
-                      养老金 ¥{{ item.commission }}
+                      养老金 ¥{{ state.currentTab === PLATFORM_NAME.DC ? item.yanglao : item.commission }}
                     </div>
                   </div>
                 </div>

src/pages/store/product/detail.vue

@@ -17,6 +17,7 @@ import {DcProductModel} from "~/apis/model/dacang.model";
 import {CDN_URL} from "~/config/app";
 import {debounce} from "lodash-es";
 import dayjs from "dayjs";
+import {getShareId} from "~/apis/product";
 
 const usePageStore = usePageStoreWidthOut()
 
@@ -87,8 +88,13 @@ onLoad((option: any) => {
   // const id = '4858'
   state.id = option.id
   // state.id = 4858
-  state.shareId = option.shareID
-
+  const fromShareId = option.shareID
+  console.log(fromShareId + '---share_id...')
+  // if (state.shareId) {
+  if (fromShareId) {
+    userStore.setShareId(fromShareId)
+  }
+  // }
   getRecommendList({
     page: 1,
     limit: 10
@@ -96,11 +102,16 @@ onLoad((option: any) => {
     state.recommendList = res.list
   })
 
+  getShareId({ pid: state.id, type: 1}).then(res => {
+    state.shareId = res.share_id
+  })
+
 })
 
 function loadProductDetail() {
+
   getProductDetail(state.id).then(res => {
-    console.log(res)
+    // console.log(res)
     detail.value = res
 
     if (res && res.mer_id && res.mer_id === '148') {
@@ -117,6 +128,7 @@ function loadProductDetail() {
         console.info(res)
       })
     }
+
     // if (detail.value.mer_id === '148') {
     // }
     uni.hideLoading()
@@ -133,18 +145,56 @@ function loadProductDetail() {
   })
 }
 
-onShareAppMessage(() => {
-  return {
-    title: `${detail.value.store_name}`,
-    path: `pages/store/product/detail?id=${state.id}&from=share`
-  }
+onShareAppMessage(async () => {
+  await uni.showLoading({
+    title: '分享中',
+    icon: 'none'
+  })
+  return getShareId({ pid: state.id, type: 1 }).then(res => {
+    if (res) {
+      state.shareId = res.share_id
+      uni.hideLoading()
+      return {
+        title: `${detail.value.store_name}`,
+        path: `pages/store/product/detail?id=${state.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}`,
-    query: `id=${state.id}&from=share`
+    query: `id=${state.id}&from=share&shareID=${state.shareId}`
   }
+
 })
 
 

src/pages/user/index.vue

@@ -310,7 +310,7 @@ function handleShowMyRulePage() {
 }
 </script>
 <template>
-  <div v-if="state.isLogin">
+  <div v-if="state.isLogin" class="pb-safe">
     <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0"></div>
     <div class="flex flex-col gap-4 relative px-3 pb-safe">
       <div class="pt-15 ">

src/pages/user/login/index.vue

@@ -5,6 +5,7 @@ import CXBPhoneLoginButton from "~/components/CXBPhoneLoginButton/CXBPhoneLoginB
 import CXBNotLoginButton from "~/components/CXBNotLoginButton/CXBNotLoginButton.vue";
 import {useUserStore} from "~/stores/userStore";
 import FNavBar from "~/components/FNavBar/FNavBar.vue";
+import Cache from "~/utils/cache";
 // usePageStore.setPageConfig({
 //   currentPage: {
 //     type: 'tab',
@@ -54,6 +55,12 @@ async function handleWexinLogin() {
         source: 'cxb'
       }).then(unionRes => {
         console.log(unionRes)
+        const shareId = Cache.get('SHARE_ID')
+
+        if (shareId) {
+          params.share_id = shareId
+          // params = Object.assign({}, params, { shareId })
+        }
         wechatCheck(unionRes.unionid).then(checkRes => {
           // console.log(checkRes)
           userStore.login(checkRes.token, checkRes.exp)

src/pages/user/login/other-phone.vue

@@ -39,6 +39,7 @@
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import CXBBanner from "~/components/CXBBanner/CXBBanner.vue";
 import {authSmsLogin, authVerify} from "~/apis/auth.api";
+import Cache from "~/utils/cache";
 const userStore = useUserStore()
 
 const state = reactive({
@@ -103,9 +104,18 @@ function handleViewXieyi(type: number) {
 }
 
 function handleLogin() {
-  authSmsLogin({
+  const shareId = Cache.get('SHARE_ID')
+
+  let params = {
     phone: state.phone,
-    sms_code: state.code
+    sms_code: state.code,
+    // share_id:
+  }
+  if (shareId) {
+    params.share_id = shareId
+  }
+  authSmsLogin({
+    ...params
   }).then(authRes => {
     console.log(authRes)
     userStore.login(authRes.token, authRes.exp)
@@ -115,6 +125,7 @@ function handleLogin() {
       title: '登录成功',
       icon: 'none'
     })
+    Cache.clear('SHARE_ID')
     state.isAuthVerify = false
 
     setTimeout(() => {

src/stores/userStore.ts

@@ -11,7 +11,8 @@ interface UserStoreState {
     uid: string | null
     mer_id: number
     permissionList: Array<string> | null
-    yanglao: number
+    yanglao: number,
+    shareId: string | null
 }
 
 export const useUserStore = defineStore('userStore', {
@@ -23,12 +24,20 @@ export const useUserStore = defineStore('userStore', {
         uid: Cache.get(UID) || null,
         mer_id: 0, // 店铺 ID
         yanglao: 0,
+        shareId: null,
         permissionList: null // 权限列表
     }) as UserStoreState,
     actions: {
         // getYanglaojinStatistics().then(res => {
         //     state.all_yanglao = res.all_yanglao
         // })
+        setShareId(shareId: string) {
+            this.shareId = shareId
+            Cache.set('SHARE_ID', shareId)
+        },
+        // getShareId(shareId: string) {
+        //
+        // },
         async getUserYanglaoJin() {
             const res = await getYanglaojinStatistics()
             // this.yanglao = res.all_yanglao