shish 1 месяц назад
Родитель
Сommit
df17e6138f

+ 0 - 16
hdApp/src/admin/home/components/purchase-ghs-panel.vue

@@ -130,14 +130,6 @@
                     <text class="waite_clear_order" @click.stop="settleAccounts(ghsInfo)">
                       待结 ¥{{ Math.abs(parseFloat(ghsInfo.balance)) }} 查看明细 &gt;
                     </text>
-                    <view
-                      class="settle-options flex-row"
-                      :class="{ 'settle-options--single': !canSelectOrderClear(ghsInfo) }"
-                    >
-                      <view class="settle-option" @click.stop="recharge(ghsInfo)">
-                        <text class="settle-option__title">填金额结算</text>
-                      </view>
-                    </view>
                   </view>
                 </view>
 
@@ -496,14 +488,6 @@ export default {
     settleAccounts(item) {
       this.pageTo({ url: '/pagesPurchase/gathering?id=' + item.id })
     },
-    canSelectOrderClear(ghsInfo) {
-      if (!ghsInfo) {
-        return false
-      }
-      return Number(ghsInfo.debtNum) > 0
-        || Number(ghsInfo.debtAmount) > 0
-        || Number(ghsInfo.remainDebtAmount) > 0
-    },
     getGHSList() {
       return ghsList().then(res => {
         this.supplierList = res.data.list

+ 29 - 1
hdApp/src/pagesPurchase/gathering.vue

@@ -1,5 +1,6 @@
 <template>
 <view class="app-content">
+  <button class="admin-button-com blue custom-amount-btn" @click="goCustomPay">自定义金额</button>
   <view class="order-page">
     <view class="top-view">
       <view class="top-row">
@@ -253,11 +254,36 @@ export default {
     },
     back () {
       uni.navigateBack({})
+    },
+    /** 跳转批发商自定义金额充值/结算页(固定入口,与选单结清并列) */
+    goCustomPay () {
+      if (!this.ghsInfo || !this.ghsInfo.id) {
+        this.$msg('批发商信息加载中')
+        return
+      }
+      this.pageTo({
+        url: '/admin/ghs/pay?id=' + this.ghsInfo.id + '&salt=' + (this.ghsInfo.salt || ''),
+        type: 2
+      })
     }
   }
 }
 </script>
 <style lang="scss" scoped>
+.custom-amount-btn {
+  position: fixed;
+  top: 108upx;
+  right: 24upx;
+  z-index: 110;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 200upx;
+  height: 80upx;
+  font-size: 30upx;
+  box-shadow: 0upx 4upx 12upx 0upx rgba(9, 197, 103, 0.35);
+  box-sizing: border-box;
+}
 .order-page {
   height: 100%;
   display: flex;
@@ -267,8 +293,10 @@ export default {
     padding: 24upx 24upx 20upx;
 		position:fixed;
 		width:100%;
+    z-index: 100;
     box-sizing: border-box;
     background-color: #fff;
+    box-shadow: 0upx 2upx 8upx 0upx rgba(0, 0, 0, 0.06);
     .top-row {
       display: flex;
       justify-content: space-between;
@@ -304,7 +332,7 @@ export default {
     }
   }
   .shop-list {
-		margin-top: 110upx;
+		margin-top:80upx;
     padding: 20upx 0;
     flex: 1;
     padding-bottom: 260upx;