From 04b4bddaac0a222760113899568d20b45af701f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 九月 2024 19:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_staff/pages/work/index.wxml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wechat_staff/pages/work/index.wxml b/wechat_staff/pages/work/index.wxml
index 686f9c1..0a75c06 100644
--- a/wechat_staff/pages/work/index.wxml
+++ b/wechat_staff/pages/work/index.wxml
@@ -1,5 +1,6 @@
 <view class="container">
-  <view class="topbg" style="background-image:url('{{topimg}}');background-color: aquamarine;">
+  <view >
+    <image class="topbg" mode="widthFix" src="{{topimg}}"></image>
     <view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">宸ヤ綔鍙�</view>
     <view class="userinfo">
       <image data-index="0" bindtap="changePath" class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
@@ -23,7 +24,7 @@
         <view class="name">鎴戠殑鏀惰棌</view>
         <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
       </view>
-      <view class="line" data-index="3" bindtap="changePath">
+      <view class="line" wx:if="{{userInfo.manageShop}}" data-index="3" bindtap="changePath">
         <view class="name">闂ㄥ簵绠$悊</view>
         <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
       </view>
@@ -34,6 +35,8 @@
         <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
       </view>
     </view>
+    <!-- index.wxml -->
+    <!-- <button bindtap="subscribe">璁㈤槄娑堟伅</button> -->
   </view>
   <!-- 璇︽儏 -->
   <van-popup show="{{ showCard }}" closeable round bind:close="onClose">
@@ -45,7 +48,7 @@
           <view class="desc">瀵艰喘 锝� {{userInfo.jobDate ||'0'}}骞寸粡楠�</view>
         </view>
       </view>
-      <image class="qrcode" src="{{userInfo.qrcodeImgFull}}"></image>
+      <image show-menu-by-longpress class="qrcode" src="{{userInfo.qrcodeImgFull}}"></image>
       <view class="text">闀挎寜鍥剧墖璇嗗埆浜岀淮鐮�</view>
     </view>
   </van-popup>

--
Gitblit v1.9.3