fix: 优化

components.d.ts

@@ -19,6 +19,7 @@ declare module '@vue/runtime-core' {
     CXBEmpty: typeof import('./src/components/CXBEmpty/CXBEmpty.vue')['default']
     CXBNotLoginButton: typeof import('./src/components/CXBNotLoginButton/CXBNotLoginButton.vue')['default']
     CXBPhoneLoginButton: typeof import('./src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue')['default']
+    CXBPrivacyPopup: typeof import('./src/components/CXBPrivacyPopup/CXBPrivacyPopup.vue')['default']
     CXBSkuPopup: typeof import('./src/components/CXBSkuPopup/CXBSkuPopup.vue')['default']
     CXBUserINdexHeader: typeof import('./src/components/CXBUserIndexHeader/CXBUserINdexHeader.vue')['default']
     CXBYaojinTag: typeof import('./src/components/CXBYaojinTag/CXBYaojinTag.vue')['default']

src/App.vue

@@ -1,18 +1,64 @@
 <script setup lang="ts">
-import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
+import { onLaunch, onShow, onHide, onReady } from "@dcloudio/uni-app";
 import {useAddressStore} from "~/stores/addressStore";
+import {useGlobalData} from "@uni-helper/uni-use";
 const addressStore = useAddressStore()
-
+const that = this
+const privacyData = uni.getStorageSync('PRIVACY')
 onLaunch(() => {
   console.log("App Launch");
+  // that.globalData = {
+  //   privacyContractName: '' ,
+  //   showPrivacy: false,
+  // }
+  wx.getPrivacySetting({
+    success(res) {
+      console.log('是否需要授权：', res.needAuthorization, '隐私协议的名称为：', res.privacyContractName);
+      if (res.needAuthorization) {
+        uni.setStorageSync('PRIVACY', { privacyContractName: res.privacyContractName, showPrivacy: true})
+        // that.globalData.privacyContractName = res.privacyContractName
+        // that.globalData.showPrivacy = true
+        // globalData.privacyContractName = res.privacyContractName;
+        // app.globalDatashowPrivacy = true;
+      } else {
+        // globalData.showPrivacy = false;
+        // this.globalData.showPrivacy = false
+        uni.setStorageSync('PRIVACY', { privacyContractName: res.privacyContractName, showPrivacy: false})
+
+      }
+    }
+  });
 });
+// useGlobalData()
 onShow(() => {
+
   console.log("App Show");
   addressStore.getCurrentAddress()
 });
 onHide(() => {
   console.log("App Hide");
 });
+onReady(() => {
+  const app = getApp()
+  app.globalData = {
+    privacyContractName: '', //隐私协议的名字
+    showPrivacy: false //控制隐私弹窗显隐
+  }
+
+
+  // const that = this;
+  // wx.getPrivacySetting({
+  //   success(res) {
+  //     console.log('是否需要授权：', res.needAuthorization, '隐私协议的名称为：', res.privacyContractName);
+  //     if (res.needAuthorization) {
+  //       globalData.privacyContractName = res.privacyContractName;
+  //       app.globalDatashowPrivacy = true;
+  //     } else {
+  //       globalData.showPrivacy = false;
+  //     }
+  //   }
+  // });
+})
 </script>
 <style lang="scss">
 @import 'nutui-uniapp/styles/index';

src/apis/user.ts

@@ -83,6 +83,8 @@ enum API {
 
     // 评论列表
     GET_REPLY_LIST = '/api/reply/list',
+    // 删除评论
+    DEL_REPLY_LIST = '/api/reply/delreply',
     // java 我的邀请
     SELECT_USER_INVITE_PROFIT = '/gateway/userCenter_service/userInviteService/selectUserInviteProfit',
     // PHP 我的邀请
@@ -166,9 +168,21 @@ enum API {
     SPREAD_NUMBER = '/gateway/userCenter_service/userShareProductService/spreadNumber',
 
     // 分享二维码图片
-    SPREAD_IMAGE = '/api/user/spread_image?type=wechat'
-}
+    SPREAD_IMAGE = '/api/user/spread_image?type=wechat',
+
+    // 绑定微信小程序关系
+    XCX_BANDING = '/api/entropy/xcx_banding',
 
+}
+// 绑定微信小程序关系
+export function xcxBanding(params: { mer_id: string, share_id: string }) {
+    return defHttp.get({
+        url: API.XCX_BANDING,
+        data: {
+            ...params
+        }
+    })
+}
 /**
  * 生成用户图片
  * @param params
@@ -435,7 +449,12 @@ export function deleteCartItem(cart_id: any[]) {
         }
     })
 }
-
+// 删除评论
+export function removeReply(reply_id: string) {
+    return defHttp.post({
+        url: `${API.DEL_REPLY_LIST}/${reply_id}`,
+    })
+}
 /**
  * 获取我的评价（评论）
  */

src/components/CXBPrivacyPopup/CXBPrivacyPopup.vue

@@ -0,0 +1,164 @@
+<template>
+
+
+  <view class="privacy" v-if="data.showPrivacy">
+    <view class="content">
+      <view class="title">隐私保护指引</view>
+      <view class="des">
+        在使用当前小程序服务之前，请仔细阅读
+        <text class="link" @click="openPrivacyContract">{{ data.privacyContractName }}</text>
+        。如果你同意{{ data.privacyContractName }}，请点击“同意”开始使用。
+      </view>
+      <view class="btns">
+        <button class="item " @click="exitMiniProgram">拒绝</button>
+        <button id="agree-btn" class="item agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+const data = reactive({
+  privacyContractName: '',
+  showPrivacy: false
+})
+const privacyData = uni.getStorageSync('PRIVACY')
+
+if (privacyData) {
+  setTimeout(() => {
+    data.privacyContractName = privacyData.privacyContractName
+    data.showPrivacy = privacyData.showPrivacy
+    // this.showPrivacy = getApp().globalData.showPrivacy;
+    // this.privacyContractName = getApp().globalData.privacyContractName;
+  }, 500);
+}
+
+// 同意隐私协议
+function handleAgreePrivacyAuthorization() {
+  // const that = this;
+  wx.requirePrivacyAuthorize({
+    success: res => {
+      data.showPrivacy = false;
+      uni.setStorageSync('PRIVACY', {
+        privacyContractName: data.privacyContractName,
+        showPrivacy: false
+      })
+      // getApp().globalData.showPrivacy = false;
+    }
+  });
+}
+
+watch(() => data.showPrivacy, (val) => {
+  val ? uni.hideTabBar() : uni.showTabBar()
+  // watch(() => state.isShowSignIn, (val) => {
+  //   val ? uni.hideTabBar() : uni.showTabBar()
+  // })
+})
+// 拒绝隐私协议
+function exitMiniProgram() {
+  const that = this;
+  uni.showModal({
+    content: '如果拒绝,我们将无法获取您的信息, 包括手机号、位置信息、相册等该小程序十分重要的功能,您确定要拒绝吗?',
+    success: res => {
+      if (res.confirm) {
+        that.showPrivacy = false;
+        uni.exitMiniProgram({
+          success: () => {
+            console.log('退出小程序成功');
+          }
+        });
+      }
+    }
+  });
+}
+// 跳转协议页面
+function openPrivacyContract() {
+  wx.openPrivacyContract({
+    fail: () => {
+      uni.showToast({
+        title: '网络错误',
+        icon: 'error'
+      });
+    }
+  });
+}
+
+</script>
+
+<style lang="scss" scoped>
+.privacy {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9999999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .content {
+    width: 85vw;
+    padding: 50rpx;
+    box-sizing: border-box;
+    background: #fff;
+    border-radius: 16rpx;
+    .title {
+      text-align: center;
+      color: #333;
+      font-weight: bold;
+      font-size: 34rpx;
+    }
+    .des {
+      font-size: 26rpx;
+      color: #666;
+      margin-top: 40rpx;
+      text-align: justify;
+      line-height: 1.6;
+      .link {
+        color: #F94032;
+        text-decoration: underline;
+      }
+    }
+    .btns {
+      margin-top: 60rpx;
+      display: flex;
+      justify-content: space-between;
+      .item {
+        justify-content: space-between;
+        width: 244rpx;
+        height: 80rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 16rpx;
+        box-sizing: border-box;
+        border: none;
+        border: 1px solid #ccc;
+
+      }
+      .reject {
+        background: #f4f4f5;
+        color: #909399;
+      }
+      .agree {
+        background: #F94032;
+        color: #fff;
+      }
+    }
+  }
+}
+button {
+  margin: 0;
+  padding: 0;
+  outline: none;
+  border-radius: 0;
+  background-color: transparent;
+  line-height: inherit;
+}
+button::after {
+  border: none;
+}
+
+
+</style>

src/manifest.json

@@ -50,6 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
+        "__usePrivacyCheck__": true, //隐私政策
         "appid" : "wxfb755febdb800f23",
         "setting" : {
             "urlCheck" : false

src/pages/home/components/navs.vue

@@ -95,6 +95,9 @@ function handleItemClick(item: any) {
       uni.switchTab({
         url: '/pages/dacang/list/index'
       })
+      // uni.navigateTo({
+      //   url: '/pagesC/goods_details/index?id=4858'
+      // })
       break;
     }
     // 会员专区

src/pages/home/components/product-list.vue

@@ -30,6 +30,7 @@ function handleProductItemClick(
         & VipProductModel
 ) {
 
+  console.log(item)
 
   function navigateToDetail(params) {
     let otherDetailUrl = `/pages/store/product/other`
@@ -44,7 +45,7 @@ function handleProductItemClick(
     })
   }
   // 京东
-  if (item.type === 6) {
+  if (item.type == 6) {
     // productParams.id = item.skuId
     const productParams: Partial<IProductDetail> = {
       platform: item.type,
@@ -64,7 +65,7 @@ function handleProductItemClick(
     return navigateToDetail(encodeBase64(productParams))
   }
   // 淘宝
-  if (item.type === 5) {
+  if (item.type == 5) {
     const productParams: Partial<IProductDetail> = {
       platform: item.type,
       id: item.id,
@@ -90,7 +91,7 @@ function handleProductItemClick(
   }
 
   // 拼多多
-  if (item.type === 1) {
+  if (item.type == 1) {
     const productParams: Partial<IProductDetail> = {
       platform: item.type,
       id: item.id,
@@ -108,6 +109,7 @@ function handleProductItemClick(
       },
       // spreadUrl: item.coupon_share_url
     }
+    console.log(productParams)
     return navigateToDetail(encodeBase64(productParams))
     // uni.navigateTo({
     //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}&allowance=${item.commission}`

src/pages/home/index.vue

@@ -12,6 +12,7 @@ import {useUserStore} from "~/stores/userStore";
 import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
 import {CDN_URL} from "~/config/app";
+import CXBPrivacyPopup from "~/components/CXBPrivacyPopup/CXBPrivacyPopup.vue";
 // import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 // import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
 const userStore = useUserStore()
@@ -210,6 +211,8 @@ function handleBannerClick(item) {
       @confirm="state.isShowSignIn = false"
       @close="state.isShowSignIn = false"
   />
+
+  <CXBPrivacyPopup />
 </template>
 <style>
 page {

src/pages/my-reply/index.vue

@@ -1,31 +1,156 @@
-<template>
-    <div v-if="list && list.length > 0"></div>
-    <div v-else>
-      <CXBEmpty />
-    </div>
-</template>
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {getMyReply} from "~/apis/user";
+import {getMyReply, removeReply} from "~/apis/user";
 import type {ReplyModel} from "~/apis/model/replyModel";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {CDN_URL} from "~/config/app";
+import dayjs from "dayjs";
+const deleteIcon = CDN_URL + '/static/assets/search_del_220616.png'
+
 const list = ref<Array<ReplyModel>>()
 onLoad((options)=> {
+
+  loadList('reload')
+} )
+const state = reactive({
+  isDel: false,
+
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  status: "noMore"
+})
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+
+  if (action === 'reload') {
+    params.page = 1
+  }
   getMyReply({
-    page: 1,
-    limit: 10
+    page: state.currentPage,
+    limit: state.pageSize
   }).then(res => {
-    console.log(res)
-    list.value = res.list
+    if (action === 'page') {
+      list.value = list.value.concat(res.list)
+    }
+    if (action === 'reload') {
+      list.value = res.list
+    }
+    state.totalPage = Math.ceil(res.count / state.pageSize);
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
   })
-} )
+
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  // console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+onPullDownRefresh(() => {
+  loadList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+})
+
+
+function handleRemove(item: any) {
+  uni.showModal({
+    content: '确定删除？',
+    success: function (res) {
+      if (res.confirm) {
+        removeReply(item.reply_id).then(res => {
+          uni.showToast({
+            title: '删除成功',
+            icon: 'none'
+          })
+        }).catch(error => {
+          uni.showToast({
+            title: error,
+            icon: "none"
+          })
+        })
+      }
+    }
+  })
+}
 </script>
+
+<template>
+    <div v-if="list && list.length > 0">
+      <div v-for="(item, index) in list" :key="index" class="text-[12px] p-3 f-hairline-bottom flex flex-col gap-3">
+        <div class="flex justify-between">
+          <div class="flex gap-3 items-center">
+            <div>
+              <image :src="item.avatar" mode="widthFix" class="rounded-full w-10 h-10"></image>
+            </div>
+            <div class="flex flex-col">
+              <div>
+                {{ item.nickname }}
+              </div>
+              <div class="text-gray-500">
+                {{ dayjs(item.create_time).format('YYYY-MM-DD')}}
+              </div>
+            </div>
+          </div>
+          <image
+              @click="handleRemove(item)"
+              :src="deleteIcon"
+              mode="widthFix" class="w-3 h-3"></image>
+        </div>
+        <div>
+          {{ item.comment }}
+        </div>
+
+        <div class="flex flex-wrap  gap-3" v-if="item.pics !==''">
+          <div v-for="(pic, picIndex) in item.pics.split(',')" :key="picIndex" v-if="item.pics.split(',').length">
+            <image :src="pic" model="widthFix" class="w-20 h-20"></image>
+          </div>
+        </div>
+
+      </div>
+      <div class=" flex justify-center items-center text-[12px] text-gray-500" >
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
+      </div>
+    </div>
+    <div v-else>
+      <CXBEmpty />
+    </div>
+</template>
 <style>
 page {
   background: #f8f8f8;
 }
 </style>
-<route lang="yaml">
+<route lang="yaml" >
 style:
   navigationBarTitleText: 我的评价
+  enablePullDownRefresh: true
+
 </route>

src/pages/my-reply/test.json

@@ -0,0 +1,55 @@
+{
+  "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"
+      }
+    ]
+  }
+}

src/pages/order/components/RefundOrderItem.vue

@@ -201,7 +201,7 @@ function handleShowDetail(orderItem) {
 
 
 
-    <div @tap.stop="handleShowOrderDetail(orderItem)">
+    <div @tap.stop="handleShowDetail(orderItem)">
         <div v-for="(orderProduct, orderProductIndex) in orderItem.refundProduct" :key="orderProductIndex">
           <div class="flex py-2 gap-3">
             <div class="flex-1 flex gap-2">

src/pages/product/integral.vue

@@ -56,6 +56,11 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
       title: error,
       icon: 'none'
     })
+    if (error == '请登录') {
+      uni.navigateTo({
+        url: '/pages/user/login/index'
+      })
+    }
   })
 }
 function handleScrollToLower() {

src/pages/refund/detail.vue

@@ -77,7 +77,6 @@ function handleHeaderClick() {
 </script>
 <template>
 
-  <div class="" v-if="state.detail">
     <div class=" ">
       <div class="top-bg relative">
         <div class="text-white p-3">
@@ -86,12 +85,17 @@ function handleHeaderClick() {
         </div>
 
         <div class="p-3">
-          <div class="bg-white rounded-lg h-18 flex justify-center items-center ">
+          <div class="bg-white rounded-lg h-18 flex justify-center items-center w-full ">
             <div class="w-full">
-              <nut-steps :current="state.currentStep" progress-dot>
+              <nut-steps :current="state.currentStep" progress-dot  v-if="state.detail.status == -1">
                 <nut-step title="退款申请"></nut-step>
                 <nut-step title="商家处理"></nut-step>
-                <nut-step :title="state.detail.status == -1 ? '退款失败' : '退款成功'"></nut-step>
+                <nut-step title="退款失败"></nut-step>
+              </nut-steps>
+              <nut-steps :current="state.currentStep" progress-dot  v-else>
+                <nut-step title="退款申请"></nut-step>
+                <nut-step title="商家处理"></nut-step>
+                <nut-step title="退款成功"></nut-step>
               </nut-steps>
             </div>
 
@@ -193,7 +197,6 @@ function handleHeaderClick() {
       </div>
 
     </div>
-  </div>
 </template>
 
 <route lang="yaml">
@@ -214,4 +217,9 @@ page {
   --nut-steps-base-title-font-size: 12px;
   background: #f8f8f8;
 }
+.nut-step-title {
+  min-width: 100rpx;
+  width: 100rpx;
+  text-align: center;
+}
 </style>

src/pages/refund/drawback.vue

@@ -91,7 +91,8 @@ function handleSubmit() {
         refundApply(state.orderId.toString(), formData).then(res => {
           // {"status":200,"message":"申请退款成功","data":{"refund_order_id":"671"}}
           uni.showToast({
-            title: '申请退款成功'
+            title: '申请退款成功',
+            icon: 'none'
           })
           setTimeout(() => {
             uni.navigateTo({

src/pages/refund/index.vue

@@ -106,7 +106,7 @@ function onClickLeft() {
       ex-class="bg-white w-screen"
       @click-left="onClickLeft"
   />
-  <div class="fixed top-18 bg-white w-full z-2">
+  <div class="fixed top-18 bg-white w-screen z-2">
     <nut-tabs v-model="state.tabvalue" class="bg-white" @change="handleTabChange">
       <nut-tab-pane title="全部"></nut-tab-pane>
       <nut-tab-pane title="退款中"></nut-tab-pane>
@@ -126,7 +126,9 @@ function onClickLeft() {
       </div>
     </div>
   </div>
-  <CXBEmpty v-else/>
+  <div class="flex h-full flex-col pt-50" v-else>
+    <CXBEmpty />
+  </div>
 
 </template>
 <route lang="yaml">
@@ -148,4 +150,6 @@ page {
 .nut-tab-pane {
   display: none !important;
 }
+
+
 </style>

src/pages/search/index.vue

@@ -444,16 +444,16 @@ function handleProductItemClick(
   }
 
   // 拼多多
-  if (item.type === 1) {
+  if (item.type == 1) {
     const productParams: Partial<IProductDetail> = {
       platform: item.type,
       id: item.id,
       title: item.name,
       featured: [item.thumb],
       allowance: item.commission,
-      salePrice: item.price,
+      salePrice: item.market_price,
       // 原价
-      price: item.market_price,
+      price: item.price,
       coupon: {
         amount: item.coupon_money
         // amount: item.coupon_money[0].discount,
@@ -515,7 +515,7 @@ function handleProductItemClick(
       allowance: item.commission,
       salePrice: item.price,
       // 原价
-      price: item.market_price,
+      price: item.price,
       // coupon: {
       //   amount: item.coupon_money
       // },

src/pages/store/home/components/MerchantProductCard.vue

@@ -57,7 +57,7 @@ const is148Merchant = computed(() => {
       <div class="line-clamp-2">
         {{item.store_name}}
       </div>
-      <div class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
+      <div v-if="!is148Merchant" class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
         <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
                mode="widthFix" class="!w-8.5"></image>
         <div class="px-2 flex items-center jusitify-center text-xs">

src/pages/store/product/detail.vue

@@ -6,7 +6,7 @@ import FCell from "~/components/FCell/FCell.vue";
 import type {SkuModel} from "~/apis/model/product.model";
 import CXBSkuPopup from "~/components/CXBSkuPopup/CXBSkuPopup.vue";
 import {createShopping} from "~/apis/order.api";
-import {getAgentInfo, getCartCount, relation, removeMyRelation} from "~/apis/user";
+import {getAgentInfo, getCartCount, relation, removeMyRelation, xcxBanding} from "~/apis/user";
 import {
   DyProductModel,
   JdProductModel,
@@ -32,6 +32,8 @@ const userStore = useUserStore()
 const shareShowTips = ref(false)
 const state = reactive({
   id: '',
+  // 推荐人绑定id
+  shareId: '',
   // 是否收藏
   isRelation: false,
   indicatorDots: true,
@@ -56,7 +58,6 @@ const state = reactive({
   flag: '1',
   isNew: '0',
   cartNum: 1,
-
   cartCount: NaN,
 })
 const detail: any = ref(null)
@@ -86,7 +87,7 @@ onLoad((option: any) => {
   // const id = '4858'
   state.id = option.id
   // state.id = 4858
-
+  state.shareId = option.shareID
 
   getRecommendList({
     page: 1,
@@ -99,14 +100,23 @@ onLoad((option: any) => {
 
 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') {
       if (detail.value && detail.value.price ) {
         detail.value.price = detail.value.price * 30
       }
     }
     state.isRelation = res.isRelation
+    if (res.merchant_type == 2) {
+      xcxBanding({
+        mer_id: res.mer_id,
+        share_id: state.shareId
+      }).then(res => {
+        console.info(res)
+      })
+    }
     // if (detail.value.mer_id === '148') {
     // }
     uni.hideLoading()

src/pages/store/product/other.vue

@@ -120,7 +120,6 @@ function loadProductDetail(product: Partial<IProductDetail>) {
         // allowance:
       })
 
-      console.log(res)
       if (res.coupon_start_time > 0) {
         mergeProductDetail({
           coupon: {

src/pages/user/login/index.vue

@@ -169,26 +169,27 @@ function onClickLeft() {
       <div class="bg-primary text-white rounded-md py-3 gap-2 flex justify-center items-center"
            @tap="handleWexinLogin"
       >
-        <image
-            src="https://test.bjtdba.com/applet/static/home/22fbc30945610a32c3b048fb1704b1e.png" mode="widthFix"
-            class="w-8 h-8"
-        ></image>
-        <div>微信授权登录</div>
+<!--        <image-->
+<!--            src="https://test.bjtdba.com/applet/static/home/22fbc30945610a32c3b048fb1704b1e.png" mode="widthFix"-->
+<!--            class="w-8 h-8"-->
+<!--        ></image>-->
+        <div>一键登录</div>
       </div>
 
-      <CXBPhoneLoginButton :text="'微信绑定手机号登录'"/>
-      <div class="text-xs text-gray flex flex-col justify-center items-center">
-        <div>
-          登录代表您同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span
-            class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>
-        </div>
-      </div>
+      <CXBPhoneLoginButton :text="'手机号快捷登录'"/>
+<!--      <div class="text-xs text-gray flex flex-col justify-center items-center">-->
+<!--        <div>-->
+<!--          登录代表您同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
+<!--            class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
+<!--        </div>-->
+<!--      </div>-->
       <navigator url="/pages/user/login/other-phone"
           class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm">
         <div>其他手机号登录</div>
       </navigator>
     </div>
     <CXBNotLoginButton :key="state.key"/>
+
   </div>
 
 </template>

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

@@ -22,12 +22,12 @@
     <div class="flex w-full">
       <div class="p-3 w-full">
         <nut-button type="primary" @click="handleLogin" block :disabled="!isFormVerify">登录</nut-button>
-        <div class="text-xs text-gray flex flex-col justify-center items-center p-3">
-          <div>
-            登录代表您同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span
-              class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>
-          </div>
-        </div>
+<!--        <div class="text-xs text-gray flex flex-col justify-center items-center p-3">-->
+<!--          <div>-->
+<!--            我已阅读并同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
+<!--              class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
+<!--          </div>-->
+<!--        </div>-->
 
       </div>
 

src/pagesC/goods_details/index.vue

@@ -0,0 +1,36 @@
+<script setup lang="ts">
+onLoad((option) => {
+  if (option && option.id) {
+    uni.redirectTo({
+      url: `/pages/store/product/detail?id=${option.id}&shareID=${option.shareID}`
+    })
+  } else {
+    uni.switchTab({
+      url: '/page/home/index'
+    })
+  }
+})
+</script>
+
+<style>
+page {
+  background-color: #f8f8f8;
+}
+button {
+  margin: 0;
+  padding: 0;
+  outline: none;
+  border-radius: 0;
+  background-color: transparent;
+  line-height: inherit;
+}
+
+button::after {
+  border: none;
+}
+
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 商品详情
+</route>

vite.config.ts

@@ -37,6 +37,7 @@ export default defineConfig({
         UniPages({
             routeBlockLang: 'yaml',
             minify: true,
+            subPackages: ['src/pagesC']
         }),
         UnoCSS(),
         // https://github.com/antfu/unplugin-auto-import