shish 4 месяцев назад
Родитель
Сommit
2b69944571

+ 1 - 1
hdApp/src/admin/home/me.vue

@@ -167,7 +167,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>

+ 13 - 6
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)) {

+ 11 - 1
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