From bb9a32d2960794cf9a1d02026b0c443102e1aed8 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Wed, 24 Apr 2024 21:53:31 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                        |  6 ++
 src/pages/common/groupbuy/detail.vue  |  2 +-
 src/pages/common/groupbuy/index.vue   |  2 +-
 src/pages/common/register/index.vue   | 82 ++++++++++++++++++++++++---
 src/pages/common/webview/index.vue    |  2 +-
 src/pages/home/index.vue              | 16 ++++--
 src/pages/mine/index.vue              |  8 ++-
 src/pages/mine/subs/contact/index.vue | 60 ++++++++++++++++++++
 src/permission.ts                     |  2 +-
 9 files changed, 158 insertions(+), 22 deletions(-)
 create mode 100644 src/pages/mine/subs/contact/index.vue

diff --git a/src/pages.json b/src/pages.json
index c3b4cd6..30f2fd5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -196,6 +196,12 @@
           "style": {
             "navigationBarTitleText": "新增收货地址"
           }
+        },
+        {
+          "path": "contact/index",
+          "style": {
+            "navigationBarTitleText": "联系商家"
+          }
         }
       ]
     }
diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue
index 88cfd7c..bceba2a 100644
--- a/src/pages/common/groupbuy/detail.vue
+++ b/src/pages/common/groupbuy/detail.vue
@@ -3,7 +3,7 @@
     <view class='swiper-container'>
       <swiper class='swiper' :interval='1500' :duration='1000' @change='swiperChange'>
         <swiper-item v-for='(item,index) in bannerList' :key='index'>
-          <image :src='item||defaultImage' />
+          <image :src='item||defaultImage' mode='aspectFill'/>
         </swiper-item>
       </swiper>
       <view class='indicator'>
diff --git a/src/pages/common/groupbuy/index.vue b/src/pages/common/groupbuy/index.vue
index 23144c1..ac8030f 100644
--- a/src/pages/common/groupbuy/index.vue
+++ b/src/pages/common/groupbuy/index.vue
@@ -10,7 +10,7 @@
       <!--            <u-list-item v-for='(item,index) in groupbuyList' :key='index'>-->
       <view class='c-flex-column' v-for='(item,index) in groupbuyList' :key='index'>
         <view class='item c-flex-row' @click.stop='goPath(`/pages/common/groupbuy/detail?id=${item.id}`)'>
-          <image class='goods-image' :src='JSON.parse(item.content)[0].images||defaultImage' />
+          <image class='goods-image' mode='aspectFill' :src='JSON.parse(item.content)[0].images||defaultImage' />
           <view class='c-flex-column' style='flex: 1'>
             <view class='goods-name'>{{ item.name }}</view>
             <view class='middle-view c-flex-row'>
diff --git a/src/pages/common/register/index.vue b/src/pages/common/register/index.vue
index dd23e61..c58cf47 100644
--- a/src/pages/common/register/index.vue
+++ b/src/pages/common/register/index.vue
@@ -1,27 +1,62 @@
 <template>
   <view class='content'>
     <image class='bg-image' :src='assetsUrl("bg_register.png")' />
+
+    <image src='./static/images/ic_register_gift_text.png'
+    style='align-self: center;position: relative;width: 356rpx;height: 124rpx;margin-top: 70rpx'/>
     <view class='card-view'>
-      <view class='mobile-view c-flex-row'>
+      <view class='mobile-view c-flex-row' style='display: none'>
         <image :src='assetsUrl("ic_register_mobile.png")' />
-        <input placeholder='请输入手机号' inputmode='number' maxlength='11' />
+        <input placeholder='请输入手机号' inputmode='number' maxLength='11' />
       </view>
 
-      <view class='captcha-view c-flex-row'>
+      <view class='captcha-view c-flex-row' style='display: none'>
         <view class='c-flex-row'>
           <image :src='assetsUrl("ic_register_captcha.png")' />
-          <input placeholder='请输入验证码' inputmode='number' maxlength='6' />
+          <input placeholder='请输入验证码' inputmode='number' maxLength='6' />
         </view>
         <text @click.stop='startCountdown'>{{ countdown }}</text>
       </view>
 
-      <text class='btn_register' @click.stop='register'>注册领券</text>
+      <text class='btn_register' style='display: none' @click.stop='register'>注册领券</text>
+
+      <image :src='companyConfigInfo.regqrcode||defaultImage' :show-menu-by-longpress='true' mode='aspectFill'
+             style='width: 439rpx;height: 439rpx;align-self: center' />
+      <text style='font-size: 26rpx;
+      margin-top: 10rpx;
+      align-self: center;color: #666666;'>长按扫码注册
+      </text>
+
+      <view class='divider' />
+      <view class='coupon c-flex-column' @click.stop='goPath("/pages/mine/subs/coupon/index")'>
+        <view class='c-flex-row'>
+          <text class='coupon-name'>新人“福“利券</text>
+          <image :src='assetsUrl("ic_arrow_right_gray.png")' />
+        </view>
+        <text class='expired-time'>有效期至2023.11.12</text>
+      </view>
+      <view class='divider' />
+
+      <text style='font-size: 28rpx;
+      font-weight: bold;
+color: #333333;margin-top: 20rpx'>福利详情
+      </text>
+      <text style='font-size: 28rpx;
+color: #333333;margin-top: 14rpx'>1.优惠金额10元\n
+        2.满300减50\n
+        3.赠送3张
+      </text>
     </view>
   </view>
 </template>
 
 <script lang='ts' setup>
-import { assetsUrl } from '@/utils/assets';
+import { assetsUrl, defaultImage } from '@/utils/assets';
+import { useUserStore } from '@/store';
+import { goPath } from '@/utils';
+
+const userStore = useUserStore();
+const { companyConfigInfo } = storeToRefs(userStore);
 
 const countdown = ref('获取验证码');
 
@@ -68,9 +103,9 @@ const register = () => {
 .card-view {
   background: #FFFFFF;
   border-radius: 10rpx;
-  margin: 0 50rpx;
-  padding: 40rpx;
-  top: 600rpx;
+  margin: 0 40rpx;
+  padding: 50rpx;
+  top: 150rpx;
   position: relative;
 
   .mobile-view {
@@ -140,5 +175,34 @@ const register = () => {
     color: #FFFFFF;
     margin-top: 46rpx;
   }
+
+  .divider {
+    border-bottom-style: dashed;
+    border-color: #E98585;
+    border-width: 0.2rpx;
+    margin-top: 34rpx
+  }
+
+  .coupon {
+    margin-top: 30rpx;
+
+    .coupon-name {
+      display: flex;
+      font-size: 36rpx;
+      color: #D95554;
+      flex: 1;
+    }
+
+    image {
+      width: 13rpx;
+      height: 24rpx;
+    }
+
+    .expired-time {
+      font-size: 28rpx;
+      color: #333333;
+      margin-top: 2rpx;
+    }
+  }
 }
 </style>
diff --git a/src/pages/common/webview/index.vue b/src/pages/common/webview/index.vue
index fb9ae6a..9f4a964 100644
--- a/src/pages/common/webview/index.vue
+++ b/src/pages/common/webview/index.vue
@@ -7,6 +7,6 @@ const url = ref<string>('');
 
 onLoad((params: any) => {
   if(params.url)
-    url.value = params.url;
+    url.value = decodeURIComponent(params.url);
 });
 </script>
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 40ac0db..1bdb081 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -16,7 +16,7 @@
 
       <view class='user-info-card' @click.stop='goPath("/pages/mine/index")'>
         <image class='user-avatar' :src='userInfo.image||defaultAvatar' mode='aspectFill' />
-        <text class='user-name primary-text-color'>{{ userInfo?.nickName || '未登录' }}</text>
+        <text class='user-name primary-text-color'>{{ userInfo?.nickName || '未登录未登录未登录未登录未登录未登录未登录未登录未登录未登录' }}</text>
         <view class='integral-view primary-text-color' @click.stop='goPath("/pages/mine/subs/integral/index")'>
           <text>{{ userInfo?.integration || 0 }}</text>
           <text>积分</text>
@@ -34,12 +34,12 @@
 
       <view class='menu-view'>
         <view @click.stop='goPath("/pages/mine/subs/recharge/index")'>
-          <image :src='assetsUrl("ic_member_card.png")' style='width: 108rpx;height: 72rpx;padding: 11rpx 0' />
+          <image :src='assetsUrl("ic_member_card2.png")' style='width: 108rpx;height: 72rpx;padding: 11rpx 0' />
           <text>会员充值</text>
         </view>
         <view class='divider' style='margin: 0;height: 153rpx' />
         <view @click.stop='goPath("/pages/mine/subs/coupon/index")'>
-          <image :src='assetsUrl("ic_coupon.png")' style='width: 108rpx;height: 95rpx' />
+          <image :src='assetsUrl("ic_coupon2.png")' style='width: 108rpx;height: 95rpx' />
           <text>优惠券</text>
         </view>
       </view>
@@ -80,17 +80,17 @@ const currentBannerIndex = ref(0);
 const submenuList = [
   {
     title: '注册有礼',
-    icon: assetsUrl('ic_register_gift.png'),
+    icon: assetsUrl('ic_register_gift2.png'),
     path: '/pages/common/register/index'
   },
   {
     title: '团购秒杀',
-    icon: assetsUrl('ic_groupbuy.png'),
+    icon: assetsUrl('ic_groupbuy2.png'),
     path: '/pages/common/groupbuy/index'
   },
   {
     title: '入群有礼',
-    icon: assetsUrl('ic_group_gift.png'),
+    icon: assetsUrl('ic_group_gift2.png'),
     path: '/pages/home/subs/group/join'
   }
 ];
@@ -252,6 +252,10 @@ const swiperChange = (e: any) => {
     font-size: 30rpx;
     font-weight: bold;
     margin-left: 16rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-right: 20rpx;
   }
 
   .integral-view {
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 5c3a4e3..f46f616 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -73,6 +73,7 @@ import { getOrderList } from '@/api/order';
 import OfficialAccountDialog from '@/components/official-account-dialog.vue';
 import { useUserStore } from '@/store';
 
+const userStore = useUserStore();
 const officialAccountDialogRef = ref();
 
 const orderActionList = ref([{
@@ -112,7 +113,7 @@ const serviceList = [
   }, {
     title: '联系商家',
     icon: assetsUrl('ic_member_service_contact.png'),
-    path: 'call'
+    path: '/pages/mine/subs/contact/index'
   }
   // ,{
   //   title: '推广中心',
@@ -127,7 +128,6 @@ const { userInfo, companyInfo, companyConfigInfo } = storeToRefs(store);
 const cardLink = ref('');
 const unPaidOrderCount = ref(0);
 
-
 onLoad(() => {
   if(!isLogin()) {
     goLogin();
@@ -144,11 +144,13 @@ onShow(async () => {
   unPaidOrderCount.value = list.filter((item: any) => isPending(item))?.length || 0;
   const { cardurl } = await getCardLink();
   cardLink.value = cardurl;
+  await userStore.getProfile();
 });
 
 const openCard = () => {
   // const url = 'https://mp.weixin.qq.com/bizmall/activatemembercard?action=preshow&&encrypt_card_id=LI%2FNyDp0x3z8XXorvvrHzSR4VUPa2vlioBg2xkDT3HqybiAFNsNgjH7pBpyKGrSA&outer_str=1702887425732870145&biz=MzU2MTg5MjgxMg%3D%3D#wechat_redirect';
-  goPath(`/pages/common/webview/index?url=${cardLink.value}`);
+  goPath(`/pages/common/webview/index?url=${decodeURIComponent(cardLink.value)}`);
+  // uni.navigateToMiniProgram({ appId: 'wxeb490c6f9b154ef9' });
 };
 
 const gotoPath = (path: string) => {
diff --git a/src/pages/mine/subs/contact/index.vue b/src/pages/mine/subs/contact/index.vue
new file mode 100644
index 0000000..958e3cb
--- /dev/null
+++ b/src/pages/mine/subs/contact/index.vue
@@ -0,0 +1,60 @@
+<template>
+  <view class='card-view'>
+    <view class='c-flex-row'>
+      <text class='key'>姓名</text>
+      <text class='value'>{{companyInfo.creatorName||companyInfo.companyName}}</text>
+    </view>
+    <view class='divider' />
+    <view class='c-flex-row'>
+      <text class='key'>手机号</text>
+      <text class='value'>{{companyInfo.telphone}}</text>
+      <image src='./static/images/ic_contact_merchant.png' @click.stop='call' />
+    </view>
+  </view>
+</template>
+
+<script lang='ts' setup>
+import { useUserStore } from '@/store';
+
+const { companyInfo } = storeToRefs(useUserStore());
+const call = () => {
+  uni.makePhoneCall({
+    phoneNumber: companyInfo.value.telphone
+  });
+};
+</script>
+
+<style lang='scss' scoped>
+.card-view {
+  background-color: #fff;
+  padding: 30rpx 20rpx;
+  margin: 24rpx;
+  border-radius: 10rpx;
+
+  .divider {
+    margin: 30rpx 0;
+  }
+
+  .c-flex-row {
+    .key {
+      font-size: 30rpx;
+      color: #7E7E7E;
+      width: 120rpx;
+    }
+
+    .value {
+      display: flex;
+      font-weight: 400;
+      font-size: 30rpx;
+      color: #333333;
+      flex: 1;
+    }
+
+    image {
+      width: 39rpx;
+      height: 41rpx;
+      margin-right: 10rpx;
+    }
+  }
+}
+</style>
diff --git a/src/permission.ts b/src/permission.ts
index 176caf9..c435883 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -3,7 +3,7 @@ import { getToken } from '@/utils/auth';
 // 登录页面
 const loginPage = '/pages/common/login/index';
 // 页面白名单
-const whiteList = ['/', '/pages/common/login/index', '/pages/home/index'];
+const whiteList = ['/', '/pages/common/login/index', '/pages/home/index','/pages/common/register/index'];
 
 // 检查地址白名单
 function checkWhite(url: string) {