shish 4 лет назад
Родитель
Сommit
186f322129

+ 18 - 2
ghsApp/src/admin/billing/affirm.vue

@@ -81,11 +81,22 @@
             <input type="number" placeholder="请填写,留空免运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
+<!-- #ifdef MP-WEIXIN -->
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">结账方式</view>
-            <button @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">待结账</button>
-            <button @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">已结账</button>
+            <button @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">欠款</button>
+            <button @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
           </tui-list-cell>
+<!-- #endif -->
+
+<!-- #ifdef APP-PLUS -->
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+            <view class="tui-title">结账方式</view>
+            <button @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">待付款</button>
+            <button @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
+            <button @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">欠款</button>
+          </tui-list-cell>
+<!-- #endif -->
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
             <div class="tui-title">收款方式</div>
@@ -219,6 +230,11 @@ export default {
   },
   onLoad (option) {
 
+    // #ifdef MP-WEIXIN
+    //如果在微信端,默认欠款是首选项
+    this.form.hasPay = 2
+    // #endif
+
     this.kdType = option.kdType
 
     if (!this.getMerchantInfo) {

+ 2 - 2
ghsApp/src/pagesOrder/detail.vue

@@ -81,8 +81,8 @@
 				<view>结算状态:</view>
 					<view style="color:red;font-weight:bold;">欠款</view>
 					<view class="price">
-						<text v-if="detailInfo.debtAmount > 0" @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' style="margin-right:50upx;color:#3385FF;font-size:26upx;">全部欠账</text>
-						<button @click="settleOrder(detailInfo)" class="admin-button-com">结清</button>
+						<text v-if="detailInfo.debtAmount > 0" @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' style="margin-right:60upx;color:#3385FF;font-size:26upx;">全部欠款单</text>
+						<button @click="settleOrder(detailInfo)" class="admin-button-com">结清本单</button>
 					</view>
 				</view>
 				<view class="order-info_box" v-else>

+ 2 - 2
ghsApp/src/pagesPurchase/info.vue

@@ -65,8 +65,8 @@
 				<view>结算状态:</view>
 					<view style="color:red;">欠款</view>
 					<view class="price">
-					<text v-if="detailInfo.debtAmount > 0" @click="goToClear(detailInfo)" style="margin-right:38upx;color:#3385FF;font-size:26upx;">全部欠</text>
-					<button @click="clearOrder(detailInfo)" class="admin-button-com">结</button>
+					<text v-if="detailInfo.debtAmount > 0" @click="goToClear(detailInfo)" style="margin-right:38upx;color:#3385FF;font-size:26upx;">全部欠款单</text>
+					<button @click="clearOrder(detailInfo)" class="admin-button-com">结清本单</button>
 					</view>
 				</view>
 				<view class="order-info_box" v-else>