支付功能优化

ghsApp/src/admin/home/components/OrderItem.vue

@@ -2,7 +2,7 @@
     <view  @click="pageTo({url:'/pagesOrder/detail',query: {id: item.id}})">
         <view class="order-top_box" style="position:relative;">
 
-        <image style="width:105upx;position:absolute;top:80upx;right:12upx;" v-if="item.status == 1 && isScanEnv"
+        <image style="width:105upx;position:absolute;top:80upx;right:12upx;" v-if="item.status == 1"
         @click.stop="pageTo({url:'/admin/billing/toPay',query: {orderId:item.id,orderSn:item.orderSn,actPrice:item.actPrice}})"
          mode="widthFix" :src="`${constant.imgUrl}/icon/codePay8.png`"></image>
 

hdApp/src/api/purchase/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const getDetail = data => {
+	return https.get("/purchase/detail", data);
+};
+
 /** *
  * 采购订单详情
  */

hdApp/src/pagesPurchase/shopping.vue

@@ -3,7 +3,7 @@
     <app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="20%"/>
     <view class="pay_list">
       <block v-if="!$util.isEmpty(list.data)">
-        <OrderItem v-for="(item, index) in list.data" :key="index" :info="item" @click="gotoDetails"></OrderItem>
+        <OrderItem v-for="(item, index) in list.data" :key="index" :info="item" @click="goToDetail"></OrderItem>
       </block>
       <block v-else>
         <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)"/>
@@ -105,14 +105,9 @@ export default {
         this.tabs[4].value = res.data.shop.cgFinish // 已完成
       })
     },
-    // 采购记录详情
-    gotoDetails (val) {
-      console.log(val)
-      uni.navigateTo({
-        url: '/pagesPurchase/purDetails?status=' + val.status + '&id=' + val.id
-      })
+    goToDetail (val) {
+      uni.navigateTo({ url: '/pagesPurchase/purDetails?id=' + val.id })
     },
-    // 去往采购页面
     addEvent() {
       uni.navigateTo({url: '/pagesPurchase/order'})
     }

hdApp/src/pagesPurchase/wechatPay.vue

@@ -15,30 +15,22 @@
             <span class="app-size-36 app-bold">{{ realPrice || '0.00'}}</span>
           </div>
           <div class="order-num app-color-3">订单号: {{ orderSn || ''}}</div>
-          <div v-if="count > 0" class="order-num app-color-3" style="margin-top:18upx;font-size:26upx;"><span style="font-weight:bold;padding-right:8upx;">{{count}}</span>秒后失效</div>
+          <div v-if="remainPayTime > 0" class="order-num app-color-3" style="margin-top:18upx;font-size:26upx;"><span style="font-weight:bold;padding-right:8upx;">{{remainPayTime}}</span>秒后失效</div>
           <div v-else class="order-num app-color-3" style="margin-top:12upx;font-size:26upx;">订单已失效</div>
         </block>
         <block>
-          <!-- <view class="balance">余额：¥{{balance}}</view> -->
           <div class="call-one-btn">
-
             <view v-if="Number(balance) >= Number(realPrice)">
-              <!-- <button class="button-com pay-wx" :class="[count >0 ? 'green':'default']" :disabled="count >0 ? false : true" v-if="Number(balance) >0" @click="balancePay">余额支付</button> -->
-              <button class="button-com pay-wx" :class="[count >0 ? 'green':'default']" :disabled="count >0 ? false : true" @click="_wxPay">微信支付</button>
+              <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="wxPayFn">微信支付</button>
             </view>
             <view v-else>
-              <button class="button-com pay-wx" :class="[count >0 ? 'green':'default']" :disabled="count >0 ? false : true" @click="_wxPay">微信支付</button>
-              <!-- <button class="button-com pay-wx" :class="[count >0 ? 'green':'default']" :disabled="count >0 ? false : true" v-if="Number(balance) >0" @click="balancePay">余额支付</button> -->
+              <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="wxPayFn">微信支付</button>
             </view>
-
-            <button class="button-com pay-wx" :class="[count >0 ? 'green':'default']" :disabled="count >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">记欠款</button>
-
+            <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">记欠款</button>
           </div>
-
         </block>
       </div>
     </div>
-    <!-- 键盘 -->
     <keyboard-module :show="keyShow" @comfirm="hideKeyFn" @clickKey="clickKeyFn" :psdShow="true" :type="_type" @closeKey="closeKeyFn" />
     <alert-module>
       <div class="go-login-module">
@@ -49,7 +41,7 @@
 </template>
 
 <script>
-import { purchaseBalancePay, purchaseDebtPay, purchaseWxPay } from "@/api/purchase/index";
+import { purchaseBalancePay, purchaseDebtPay, purchaseWxPay,getDetail } from "@/api/purchase";
 import { getCgPayWay } from "@/api/shop/index";
 import keyboardModule from './components/keyboard'
 import { mapGetters } from "vuex";
@@ -72,16 +64,13 @@ export default {
       realPrice: '',
       _type: '1',
       pageId: '',
-      count:120,
+      remainPayTime:120,
       hasDebtPay:0,
       balance:0
     };
   },
   onLoad (options) {
     this.id = options.id
-    this.orderSn = options.orderSn;
-    this.realPrice = options.realPrice;
-
   },
   computed: {
     ...mapGetters(["getLoginInfo", 'getDictionariesInfo']),
@@ -91,22 +80,29 @@ export default {
   methods: {
     init(){
       let that = this
-      getCgPayWay({id:this.option.id}).then(res=>{
+
+      getDetail({id:this.option.id}).then(res=>{
         if(res.code == 1){
+          this.realPrice = res.data.realPrice ? parseFloat(res.data.realPrice) : ''
+          this.orderSn = res.data.orderSn
+
           that.hasDebtPay = res.data.hasDebtPay
           that.balance = res.data.balance
-          that.count = res.data.count
 
-          let t =setInterval(function(){
-            if(that.count > 0){
-              that.count--
-            }else{
-              clearInterval(t);
-            }
-          },1000);
+          that.remainPayTime = res.data.remainPayTime
+          if(that.remainPayTime > 0){
+            let t =setInterval(function(){
+              if(that.remainPayTime > 0){
+                that.remainPayTime--
+              }else{
+                clearInterval(t);
+              }
+            },1000);
+          }
 
         }
       })
+
     },
     debtPay () {
       let that = this
@@ -135,7 +131,7 @@ export default {
 			});
       
     },
-    _wxPay () {
+    wxPayFn () {
       uni.showLoading({title: '加载中',mask:true})
       purchaseWxPay({ orderSn: this.orderSn }).then(res => {
         uni.hideLoading()