Merge branch 'master' of git.huaml.com:zhh/front-end

hdApp/src/admin/home/mall.vue

@@ -508,10 +508,6 @@ export default {
 		showShopName(){
 			currentShop().then(res => {
 				if(res.code == 1){
-					let sjName = res.data.merchantName ? res.data.merchantName : ''
-					let shopName = res.data.shopName ? res.data.shopName : ''
-					let title = shopName == '首店' ? sjName : sjName+' '+shopName
-					uni.setNavigationBarTitle({ title: title })
           this.shopInfo = res.data?res.data:[]
           if(this.shopInfo.avatar) {
             uni.setStorageSync('shopAvatar', this.shopInfo.avatar);

hdApp/src/admin/home/me.vue

@@ -186,7 +186,7 @@
           <text class="right" @click.stop="goToPrivacy">隐私政策</text>
           <text class="right" @click.stop="closeAccount()">注销账号</text>
         </view>
-        <view class="bottom-version" @click.stop="editShopName">中央编号 {{myInfo && myInfo.mainId ? myInfo.mainId : 0}}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;version {{version}}</view>
+        <view class="bottom-version">中央编号 {{myInfo && myInfo.mainId ? myInfo.mainId : 0}}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;version {{version}}</view>
         <view class="bottom-version">闽ICP备15017325号-11A</view>
       </view>
     </template>

hdApp/src/admin/home/workbench.vue

@@ -174,7 +174,7 @@
       <view class="supplier-notice-container">
         <!-- 头部 -->
         <view class="supplier-notice-header">
-          <text class="supplier-notice-title">您已有多个供货商</text>
+          <text class="supplier-notice-title">您已有多个批发店</text>
         </view>
         
         <!-- 中间供货商列表 -->
@@ -260,9 +260,8 @@
         urlNo:1,
         shortUrlList:[],
         unReadMsgNum:0, //未读消息数
-      currentDate: '', // 当前日期信息 如：12月26号 周五
-      showBoughtTooltip: false, // 是否显示买花记录提示
-    };
+        showBoughtTooltip: false, // 是否显示买花记录提示
+      };
     },
     computed: {
       ...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo",myShopInfo:"getMyShopInfo" })
@@ -283,21 +282,20 @@
       getWeixinId().then(res => {
         this.getappIdList = res.data
       })
-      this.updateCurrentDate()
     },
-  onShow () {
-      this.unReadMsgNum = 0; // 重置未读消息数
+    onShow () {
+        this.unReadMsgNum = 0; // 重置未读消息数
+        
+        this.showBoughtTooltip = !uni.getStorageSync('boughtTooltipClosed');
       
-      this.showBoughtTooltip = !uni.getStorageSync('boughtTooltipClosed');
+        this.init();
     
-      this.init();
-  
         // 判断是否登录
         if(!this.$util.isEmpty(this.loginInfo.admin) && this.loginInfo.admin.currentShopId > 0){
             this.handleLoginStyle()  
-            // this.getUnReadMsgCount()
             this.showShopName()
         }
+
     },
     onShareAppMessage(res) {
       return { title: "花掌柜，花店管家婆", desc: "", imageUrl: "", path: "admin/home/mall" }
@@ -403,7 +401,6 @@
           }
         })
         this.showShopName()
-        this.getUnReadMsgCount()
       },
       handleLoginStyle(){
           this.loginStyle  = 1
@@ -751,21 +748,6 @@
           return false
         }
         // #endif
-      },
-      getUnReadMsgCount(){
-        unReadMsgCount().then(res=>{
-          if(res.code == 1){
-            this.unReadMsgNum = res.data.msg_count
-          }
-        })
-      },
-      updateCurrentDate(){
-        const now = new Date()
-        const month = now.getMonth() + 1
-        const date = now.getDate()
-        const weekDays = ['星期天', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
-        const week = weekDays[now.getDay()]
-        this.currentDate = `${month}-${date} ${week}`
       }
     }
   };

hdApp/src/pagesPurchase/gathering.vue

@@ -4,8 +4,8 @@
     <view class="top-view">
       <view class="top-row">
         <view class="info-item">
-          <image class="logo" :src="customInfo.avatar" />
-          <text class="name">{{ customInfo.name}}</text>
+          <image class="logo" :src="ghsInfo.avatar" />
+          <text class="name">{{ ghsInfo.name}}</text>
         </view>
         <DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='时间' />
       </view>
@@ -56,13 +56,13 @@ export default {
       checkShow: true,
       detailsList: [],
       num: "",
-      customInfo: {},
+      ghsInfo: {},
       totalAmount: "",
       isAllCheck: false,
 			searchTime:'',
 			startTime:'',
 			endTime:'',
-      ghsId:0
+      ghsId:0,
     }
   },
   onPullDownRefresh() {
@@ -154,8 +154,8 @@ export default {
     },
     getGhsInfo(id) {
       return ghsDetail({id:id}).then(res => {
-        this.customInfo = res.data
-      }).catch(err => {})
+        this.ghsInfo = res.data
+      })
     },
     checkItemEvent (item) {
       let count = 1
@@ -172,6 +172,13 @@ export default {
     },
     //批量收款
     batchConfirm () {
+
+      //如果是小向花卉和奥斯的客户，暂时引导只能通过充值方式来结账，多处要同步修改change_clear_to_recharge
+      if(this.ghsInfo.shopId == 23580 || this.ghsInfo.shopId == 36843){
+        this.pageTo({url: '/admin/ghs/pay?id='+this.ghsInfo.id+'&salt='+this.ghsInfo.salt,type:2})
+        return false
+      }
+
       let arr = []
       let that = this
       if (this.$util.isEmpty(this.selectList)) {

hdApp/src/pagesPurchase/purDetails.vue

@@ -342,7 +342,7 @@
 <script>
 import { mapGetters } from "vuex";
 import { getCgExpressTrack } from "@/api/express"
-import { purchaseDetail, purchaseDebtPay,purchaseClearCreateOrder,confirmTake,cancelOrder } from "@/api/purchase";
+import { purchaseDetail, purchaseDebtPay,purchaseClearCreateOrder,confirmTake,cancelOrder,ghsDetail } from "@/api/purchase";
 import TuiListCell from "@/components/plugin/list-cell";
 import { getGhsDataApi } from "@/api/ghs";
 import { CURRENT_ENV } from "@/config";
@@ -512,6 +512,16 @@ export default {
       }
     },
     clearOrder(){
+
+      //如果是小向花卉和奥斯的客户，暂时引导只能通过充值方式来结账，多处要同步修改change_clear_to_recharge
+      if(this.detailInfo.supplierMobile == 19224081651 || this.detailInfo.supplierMobile == 17187822038){
+        ghsDetail({id:this.detailInfo.ghsId}).then(res => {
+          let ghsInfo = res.data
+          this.pageTo({url: '/admin/ghs/pay?id='+ghsInfo.id+'&salt='+ghsInfo.salt,type:2})
+        })
+        return false
+      }
+
       let arr = []
       arr.push(this.detailInfo.id)
       let that = this