From d6bf7289fb769a5ea291de30a12eabb7637e107e Mon Sep 17 00:00:00 2001
From: Lirui <2417307363@qq.com>
Date: Sun, 7 Apr 2024 16:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/coupon/list.vue                         |  3 +-
 pages/index/category.vue                      |  3 +-
 pages/order/aftersale/detail.vue              |  4 +-
 pages/order/detail.vue                        | 52 +++++++++++++++++--
 pages/order/dispatch/content.vue              |  2 +-
 pages/order/express/list.vue                  | 19 ++++++-
 pages/public/setting.vue                      |  5 +-
 .../components/mp-authorization.vue           |  3 +-
 .../s-businessSchool/s-businessSchool.vue     | 14 +++--
 .../s-coupon-choose/s-coupon-choose.vue       |  2 +-
 .../components/s-order-card/s-order-card.vue  |  3 +-
 .../s-platform-announcement-item.vue          |  2 +-
 sheep/components/s-user-card/s-user-card.vue  |  2 +-
 .../s-ztaddress-info/s-ztaddress-info.vue     |  2 +-
 .../s-ztaddress-item/s-ztaddress-item.vue     |  2 +-
 sheep/config/index.js                         |  4 +-
 sheep/hooks/useModal.js                       |  3 +-
 17 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index 3a98f4f..8cce456 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -169,13 +169,12 @@
   }
   async function commissionCouponList() {
     const { code, data, msg } = await sheep.$api.coupon.commissionCouponList();
-    if (code === 1 && data && `${data.is_get}` === '0') {
+    if (code === 1 && data && `${data.is_get}` === '0' && `${data.level}` !== '1') {
       state.dataList.forEach((item) => {
         item.typeList = data[item.key].map(val => ({ name: val.name, time: `${val.get_start_time}~${val.get_end_time}`, id: val.id }))
       });
       state.show = true;
       state.level = data.level_name;
-      console.log(111111111);
     } else {
       getCoupon();
     }
diff --git a/pages/index/category.vue b/pages/index/category.vue
index f278e12..833c535 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -219,7 +219,7 @@
     &-item {
       border-radius: 15rpx 15rpx 15rpx 15rpx;
       background: #fff;
-      padding: 37rpx 35rpx;
+      padding: 37rpx 35rpx 0;
       margin-bottom: 25rpx;
       &-title {
         border-left: 10rpx solid var(--ui-BG-Main);
@@ -241,6 +241,7 @@
         &-item {
           width: calc(50% - 15rpx);
           cursor: pointer;
+          margin-bottom: 25rpx;
           &:not(:nth-child(even)) {
             margin-right: 15rpx;
           }
diff --git a/pages/order/aftersale/detail.vue b/pages/order/aftersale/detail.vue
index 6e05d4a..c0c09f3 100644
--- a/pages/order/aftersale/detail.vue
+++ b/pages/order/aftersale/detail.vue
@@ -115,9 +115,7 @@
           @tap="onDelete(state.info.id)"
           >删除</button
         > -->
-        <button class="ss-reset-button contcat-btn btn" @tap="sheep.$router.go('/pages/chat/index')"
-          >联系客服</button
-        >
+        <button class="ss-reset-button contcat-btn btn" @tap="sheep.$router.go('/pages/chat/index')">联系客服</button>
       </view>
     </su-fixed>
   </s-layout>
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 4c4a6a1..cd52e55 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -47,7 +47,7 @@
       </view>
       <view class="ss-font-26 ss-m-x-20 ss-m-b-70">{{ state.orderInfo.status_desc }}</view>
     </view>
-
+   
     <!-- 收货地址 -->
     <view class="order-address-box" v-if="state.orderInfo.address">
       <view class="ss-flex ss-col-center">
@@ -58,8 +58,12 @@
       </view>
       <view class="address-detail">{{ addressText }}</view>
     </view>
+
+    
     <!-- 提货地址 -->
     <view class="order-address-box" v-if="state.orderInfo.zt_address">
+      <view class="order-address-box-title">自提信息</view>
+      <view class="order-address-box-subtitle">商家信息：</view>
       <view class="ss-flex ss-col-center">
         <text class="address-username">
           {{ state.orderInfo.zt_address.linkname }}
@@ -67,6 +71,17 @@
         <text class="address-phone">{{ state.orderInfo.zt_address.linkphone }}</text>
       </view>
       <view class="address-detail">{{ state.orderInfo.zt_address.address }}</view>
+      <view class="order-address-box-subtitle">用户信息：</view>
+      <view class="ss-flex ss-col-center">
+        <text class="ztaddress-time">
+         取货时间：{{ state.orderInfo.selffetch_time }}
+        </text>
+      </view>
+      <view class="ss-flex ss-col-center">
+        <text class="ztaddress-phone">
+         预留电话：{{ state.orderInfo.self_phone }}
+        </text>
+      </view>
     </view>
 
     <view class="detail-goods" :style="[{ marginTop: state.orderInfo.address ? '0' : '-40rpx' }]">
@@ -138,7 +153,7 @@
               </view>
             </template>
             <template #priceSuffix>
-              <button class="ss-reset-button tag-btn" v-if="item.status_text">
+              <button class="ss-reset-button tag-btn" v-if="item.status_text !=='待评价'">
                 {{ item.status_text }}
               </button>
             </template>
@@ -274,6 +289,9 @@
         >
           查看发票
         </button>
+        <button class="ss-reset-button contcat-btn btn" @tap="sheep.$router.go('/pages/chat/index')"
+          >联系客服</button
+        >
       </view>
     </su-fixed>
   </s-layout>
@@ -483,7 +501,7 @@
       margin-right: 20rpx;
     }
   }
-
+  
   .order-address-box {
     background-color: #fff;
     border-radius: 10rpx;
@@ -493,16 +511,30 @@
     box-sizing: border-box;
     font-weight: 500;
     color: rgba(51, 51, 51, 1);
-
     .address-username {
       margin-right: 20rpx;
     }
 
+    &-title {
+      font-size: 32rpx;
+      color: #333;
+      font-weight: bold;
+      margin-bottom: 20rpx;
+    }
+    
+    &-subtitle {
+      font-size: 28rpx;
+      color: #333;
+      font-weight: 400;
+      margin-bottom: 20rpx;
+    }
+
     .address-detail {
       font-size: 26rpx;
       font-weight: 500;
       color: rgba(153, 153, 153, 1);
       margin-top: 20rpx;
+      margin-bottom: 20rpx;
     }
   }
 
@@ -673,4 +705,16 @@
       margin-right: 20rpx;
     }
   }
+
+  .ztaddress-time { 
+    color: #999;
+    font-weight: 400;
+    font-size: 26rpx;
+    margin-bottom: 20rpx;
+  }
+  .ztaddress-phone  {
+    color: #999;
+    font-weight: 400;
+    font-size: 26rpx;
+  }
 </style>
diff --git a/pages/order/dispatch/content.vue b/pages/order/dispatch/content.vue
index 1a1dc83..e64214b 100644
--- a/pages/order/dispatch/content.vue
+++ b/pages/order/dispatch/content.vue
@@ -10,7 +10,7 @@
         radius="20"
       >
         <template #priceSuffix>
-          <button class="ss-reset-button tag-btn" v-if="state.data.status_text">
+          <button class="ss-reset-button tag-btn" v-if="state.data.status_text !=='待评价'">
             {{ state.data.status_text }}
           </button>
         </template>
diff --git a/pages/order/express/list.vue b/pages/order/express/list.vue
index 2f70c42..dcacf53 100644
--- a/pages/order/express/list.vue
+++ b/pages/order/express/list.vue
@@ -2,9 +2,9 @@
 <template>
   <s-layout title="物流包裹">
     <view class="express-wrap">
-      <su-sticky bgColor="#FFE2B6">
+      <!-- <su-sticky bgColor="#FFE2B6">
         <view class="header ss-flex ss-p-l-24">{{ state.list.length }}个包裹已派送</view>
-      </su-sticky>
+      </su-sticky>-->
       <view
         class="express-box"
         v-for="item in state.list"
@@ -16,6 +16,7 @@
           <view class="express-box-header-num">{{
             item.express_name + ' : ' + item.express_no
           }}</view>
+          <button class="ss-reset-button copy-btn" @tap="onCopy(item.express_no)">复制</button>
         </view>
         <view class="express-box-content">
           <view class="content-address">{{ item.logs[0]?.content }}</view>
@@ -47,6 +48,10 @@
     const { data } = await sheep.$api.order.express.list(orderId);
     state.list = data;
   }
+  // 复制
+  const onCopy = (express_no) => {
+    sheep.$helper.copyText(express_no);
+  };
   onLoad((Option) => {
     state.orderId = Option.orderId;
     getExpressList(state.orderId);
@@ -101,4 +106,14 @@
       color: #999999;
     }
   }
+  .copy-btn {
+    width: 100rpx;
+    line-height: 50rpx;
+    border-radius: 25rpx;
+    padding: 0;
+    background: rgba(238, 238, 238, 1);
+    font-size: 22rpx;
+    font-weight: 400;
+    color: rgba(51, 51, 51, 1);
+  }
 </style>
diff --git a/pages/public/setting.vue b/pages/public/setting.vue
index 5841cf7..15866fc 100644
--- a/pages/public/setting.vue
+++ b/pages/public/setting.vue
@@ -50,7 +50,7 @@
         ></uni-list-item>
         <!-- 为了过审 只有iOS-App有注销账号功能 -->
         <uni-list-item
-          v-if="isLogin && sheep.$platform.os === 'ios' && sheep.$platform.name === 'App'"
+          v-if="isLogin && (sheep.$platform.os === 'ios' && sheep.$platform.name === 'App' || sheep.$platform.name === 'WechatMiniProgram')"
           title="注销账号"
           rightText=""
           showArrow
@@ -133,7 +133,8 @@
           const { code } = await sheep.$api.user.logoff();
           if (code === 1) {
             sheep.$store('user').logout();
-            sheep.$router.go('/pages/index/user');
+            // sheep.$router.go('/pages/index/user');
+            sheep.$router.go('/pages/index/login');
           }
         }
       },
diff --git a/sheep/components/s-auth-modal/components/mp-authorization.vue b/sheep/components/s-auth-modal/components/mp-authorization.vue
index 16471f4..2f4c0fb 100644
--- a/sheep/components/s-auth-modal/components/mp-authorization.vue
+++ b/sheep/components/s-auth-modal/components/mp-authorization.vue
@@ -104,7 +104,8 @@
       sheep.$helper.toast('请选择头像');
       return;
     }
-    const { code, msg } = await sheep.$api.user.updateMpUserInfo(model);
+    
+    const { code, msg } = await sheep.$api.user.updateMpUserInfo({ ...model, shareInfo: uni.getStorageSync('shareLog') || {} });
     if (code === 1) {
       sheep.$helper.toast('授权成功');
       await sheep.$store('user').getInfo();
diff --git a/sheep/components/s-businessSchool/s-businessSchool.vue b/sheep/components/s-businessSchool/s-businessSchool.vue
index 3edae48..b462116 100644
--- a/sheep/components/s-businessSchool/s-businessSchool.vue
+++ b/sheep/components/s-businessSchool/s-businessSchool.vue
@@ -5,7 +5,11 @@
                 <text class="business-school-title-left">公司及产品资质</text>
             </view>
             <view class="business-school-content">
-                <image class="image" :src="item.image" mode="aspectFill" v-for="(item, idx) in state.companyData" :key="item.id" @tap="preivewImg(idx, state.companyData)"></image>    
+              <swiper previous-margin="180rpx" next-margin="298rpx" :indicator-dots="true"  :circular="true" :interval="3000" :duration="1000">
+                <swiper-item v-for="(item, idx) in state.companyData" :key="item.id">
+                  <image class="image" :src="item.image" mode="aspectFill" @tap="preivewImg(idx, state.companyData)"></image>
+                </swiper-item>
+              </swiper>    
             </view>
         </view>
         <view class="business-school">
@@ -21,7 +25,7 @@
                     <view class="business-school-content-item-right">
                         <view class="business-school-content-item-right-title" v-html="item.title"></view>
                         <view class="business-school-content-item-right-time">
-                          <view>上传时间：{{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }}</view>
+                          <view>{{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }}</view>
                         </view>
                     </view>
                 </view>
@@ -40,7 +44,7 @@
                     <view class="business-school-content-item-right">
                         <view class="business-school-content-item-right-title" v-html="item.title"></view>
                         <view class="business-school-content-item-right-time">
-                          <view>上传时间：{{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }}</view>
+                          <view>{{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }}</view>
                         </view>
                     </view>
                 </view>
@@ -70,14 +74,14 @@
     }
     let { code: articleCode, data: { data: articleData } } = await sheep.$api.businessSchool.articleList('1');
     if (articleCode === 1) {
-      state.articleData = articleData;
+      state.articleData = articleData.slice(0, 3);
     } else {
       state.articleData = [];
     }
     let { code: saleCode, data: { data: saleData } } = await sheep.$api.businessSchool.articleList('2');
     console.log(saleData, 'saleData');
     if (saleCode === 1) {
-      state.saleData = saleData;
+      state.saleData = saleData.slice(0, 3);
     } else {
       state.saleData = [];
     }
diff --git a/sheep/components/s-coupon-choose/s-coupon-choose.vue b/sheep/components/s-coupon-choose/s-coupon-choose.vue
index 3b2fc29..2d58839 100644
--- a/sheep/components/s-coupon-choose/s-coupon-choose.vue
+++ b/sheep/components/s-coupon-choose/s-coupon-choose.vue
@@ -18,7 +18,7 @@
           <view class="model-box-content-item-title ss-flex ss-col-center ss-row-between">
             <view>{{ item.type }}</view>
             <radio
-              :checked="state.current_type === item.type"
+              :checked="state.current_type.includes(item.key)"
               color="var(--ui-BG-Main)"
               style="transform: scale(0.6)"
               @tap.stop="onChange(item.key)"
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index 8dbf1b6..a53abe2 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -52,7 +52,8 @@
       title: '已完成',
       value: '3',
       icon: '/assets/addons/shopro/uniapp/order/completed.png',
-      path: '/pages/order/aftersale/list',
+      //path: '/pages/order/aftersale/list',
+      path: '/pages/order/list',
       type: 'completed',
     },
     {
diff --git a/sheep/components/s-platform-announcement-item/s-platform-announcement-item.vue b/sheep/components/s-platform-announcement-item/s-platform-announcement-item.vue
index 47a3193..698cbb8 100644
--- a/sheep/components/s-platform-announcement-item/s-platform-announcement-item.vue
+++ b/sheep/components/s-platform-announcement-item/s-platform-announcement-item.vue
@@ -8,7 +8,7 @@
               <view class="platform-announcement-content-item-right-title" v-html="item.title"></view>
               <view class="platform-announcement-content-item-right-time" v-if="state.type === '公告列表'">{{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }}</view>
               <view class="platform-announcement-content-item-right-time" v-if="state.type !== '公告列表'">
-                <view>上传时间：{{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }}</view>
+                <view>{{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }}</view>
               </view>
             </view>
         </view>
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index 965e66d..7973bb9 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -17,7 +17,7 @@
         </view>
         <view>
           <view class="nickname-box ss-flex ss-col-center">
-            <view class="nick-name ss-m-r-20">
+            <view class="nick-name ss-m-r-20" @tap="sheep.$router.go('/pages/user/info')">
             {{ userInfo?.nickname || nickname }}
             <view class="nick-name-type" v-if="userInfo.agent">{{ userInfo.agent.level_info.name }}</view>
             </view>
diff --git a/sheep/components/s-ztaddress-info/s-ztaddress-info.vue b/sheep/components/s-ztaddress-info/s-ztaddress-info.vue
index 976cf6e..aa5a17b 100644
--- a/sheep/components/s-ztaddress-info/s-ztaddress-info.vue
+++ b/sheep/components/s-ztaddress-info/s-ztaddress-info.vue
@@ -53,7 +53,7 @@
 
   const state = reactive({
     selffetch_time: '',
-    today: '',
+    today: '2035-12-31 23:59:59', 
     phone: '',
   });
 
diff --git a/sheep/components/s-ztaddress-item/s-ztaddress-item.vue b/sheep/components/s-ztaddress-item/s-ztaddress-item.vue
index 1406146..a53a479 100644
--- a/sheep/components/s-ztaddress-item/s-ztaddress-item.vue
+++ b/sheep/components/s-ztaddress-item/s-ztaddress-item.vue
@@ -57,7 +57,7 @@
 <style lang="scss" scoped>
   .address-type {
     padding-left: 30rpx;
-    font-size: 32rpx;
+    font-size: 26rpx;
     font-weight: bold;
     color: #333333;
   }
diff --git a/sheep/config/index.js b/sheep/config/index.js
index 4d33a41..df1a4ca 100644
--- a/sheep/config/index.js
+++ b/sheep/config/index.js
@@ -3,10 +3,10 @@ export let baseUrl;
 export let version;
 if (process.env.NODE_ENV === 'development') {
   // baseUrl = import.meta.env.SHOPRO_DEV_BASE_URL;
-  baseUrl = 'https://b1.njrenzhou.com';
+  baseUrl = 'https://www.zhongkexiangjiu.com.cn';
 } else {
   // baseUrl = import.meta.env.SHOPRO_BASE_URL; https://v3.shopro.top  https://b1.njrenzhou.com
-  baseUrl = 'https://b1.njrenzhou.com'; 
+  baseUrl = 'https://www.zhongkexiangjiu.com.cn'; 
 }
 // version = import.meta.env.SHOPRO_VERSION;
 version = 'v3.0.0';
diff --git a/sheep/hooks/useModal.js b/sheep/hooks/useModal.js
index 59b89e0..069b133 100644
--- a/sheep/hooks/useModal.js
+++ b/sheep/hooks/useModal.js
@@ -97,7 +97,8 @@ export function getSmsCode(event, mobile = '') {
     let eventData = changeEvent[event]
     $api.app.sendSms({
       mobile: mobile,
-      event: eventData
+      event: eventData,
+      shareInfo: uni.getStorageSync('shareLog') || {},
     }).then((res) => {
       if (res.code === 1) {
         modalStore.$patch((state) => {