From 86fc8bbb09df7bbeb50fa714ff8bb4aea85ffef5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 15:57:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 wechat_staff/pages/store/staff.wxml |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index ffb043f..13f881d 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -2,28 +2,31 @@
   <back />
   <image src="../../static/images/design_banner@2x.png" mode="widthFix" class="bg_wrap"></image>
   <view class="container">
-    <image class="avatar" src=""></image>
+    <image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
     <view class="name_wrap">
       <view class="left">
-        <view class="name">濮撳悕</view>
+        <view class="name">{{userInfo.name}}</view>
         <view class="tag">瀵艰喘</view>
         <!-- <view class="tag">5骞寸粡楠�</view> -->
       </view>
-      <image class="qrcode" src="../../static/icon/mingpian_erweima@2x.png" mode="widthFix"></image>
+      <image wx:if="{{ userInfo.qrcodeImgFull }}" bind:tap="showQrcode" class="qrcode" src="../../static/icon/mingpian_erweima@2x.png" mode="widthFix"></image>
     </view>
     <view class="desc">
       <image src="../../static/icon/mingpian_ic_edit@2x.png" mode="widthFix"></image>
-      <view>鐢ㄥ績鏈嶅姟姣忎竴浣嶉【瀹�</view>
+      <view class="text">{{userInfo.slogans}}</view>
       <view class="icon"></view>
     </view>
     <view class="static">
       <view class="card">
+        <image src="../../static/images/mingpian_bg_nianxian.png" class="bg"></image>
         <view>浠庝笟骞撮檺</view>
-        <view class="num">5</view>
+        <view class="num">{{ userInfo.jobDate || '5' }}</view>
       </view>
       <view class="card">
+      <image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
         <view>鏈嶅姟瀹㈡埛</view>
-        <view class="num">500+</view>
+        <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.costomerNum || '--' }}+</view>
+        <view wx:else class="num">--</view>
       </view>
     </view>
     <view class="guide">
@@ -31,39 +34,50 @@
       <view class="line">
         <image class="icon" src="../../static/icon/mingpian_ic_phone@2x.png" mode="widthFix"></image>
         <text class="label">鑱旂郴鐢佃瘽</text>
-        <text class="val">1888888888888</text>
+        <text class="val">{{userInfo.phone}}</text>
       </view>
       <view class="line">
         <image class="icon" src="../../static/icon/mingpian_ic_mendian@2x.png" mode="widthFix"></image>
         <text class="label">闂ㄥ簵鍚嶇О</text>
-        <text class="val">1888888888888</text>
+        <text class="val">{{userInfo.shopName}}</text>
       </view>
       <view class="line">
         <image class="icon" src="../../static/icon/mingpian_ic_dizhi@2x.png" mode="widthFix"></image>
         <text class="label">闂ㄥ簵鍦板潃</text>
-        <text class="val">1888888888888</text>
+        <text class="val">{{userInfo.shopAddress}}</text>
       </view>
     </view>
   </view>
   <!-- footer -->
   <view class="footer" style="bottom: {{bottomLift}}px;">
-    <view class="btn">
+    <view class="btn" bindtap="openModal">
       <image src="../../static/icon/share.png" mode="widthFix"></image>
-      <view bindtap="openModal">鍒嗕韩</view>
+      <view>鍒嗕韩</view>
     </view>
   </view>
   <!-- 璇︽儏 -->
-  <van-popup show="{{ isShow }}"  closeable round bind:close="onClose">
+  <van-popup show="{{ isShow }}" closeable round bind:close="onClose">
     <view class="modal">
       <view class="header">
-        <image class="avatar" src=""></image>
+        <image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
         <view class="content">
-            <view class="name">濮撳悕</view>
-            <view class="desc">瀵艰喘 锝� 5骞寸粡楠�</view>
+          <view class="name">{{userInfo.name}}</view>
+          <view class="desc">瀵艰喘 锝� {{userInfo.jobDate ||'5'}}骞寸粡楠�</view>
         </view>
       </view>
-      <image class="qrcode" src=""></image>
+      <image class="qrcode" src="{{userInfo.qrcodeImgFull}}"></image>
       <view class="text">闀挎寜鍥剧墖璇嗗埆浜岀淮鐮�</view>
     </view>
   </van-popup>
+  <!-- 鐢ㄦ埛鍚嶇墖 -->
+  <view wx:if="{{ isShow2 }}" class="card_wrap">
+    <view class="img1">
+      <image mode="widthFix" src="{{userCard}}"></image>
+    </view>
+    <view class="btns">
+      <view class="btn" bind:tap="closeCard">鍙栨秷</view>
+      <view class="btn save" bind:tap="saveCard">淇濆瓨鍒扮浉鍐�</view>
+    </view>
+  </view>
+  <van-overlay z-index="10" show="{{ isShow2 }}" bind:click="onClickHide" />
 </view>
\ No newline at end of file

--
Gitblit v1.9.3