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

ghsApp/src/admin/billing/affirm.vue

@@ -91,8 +91,8 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">配送方式</view>
-            <button @tap="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">自取</button>
-            <button @click="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">配送</button>
+            <button @tap="setSendType(2)" class="admin-button-com middle" :class="form.sendType == 2 ? 'blue' : 'default'">自取</button>
+            <button @click="setSendType(1)" class="admin-button-com middle" :class="form.sendType == 1 ? 'blue' : 'default'">配送</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1" >
@@ -102,8 +102,9 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">结账方式</view>
-            <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>
+            <button @click="form.hasPay = 0" v-if="isScanEnv" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">待付款</button>
+            <button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">欠款</button>
+            <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
@@ -116,8 +117,8 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">打印小票</view>
-            <button @click="form.needPrint = 1" class="admin-button-com mini-btn" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>
-            <button @tap="form.needPrint = 2" class="admin-button-com mini-btn" :class="form.needPrint == 2? 'blue' : 'default'">不打</button>
+            <button @click="form.needPrint = 1" class="admin-button-com middle" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>
+            <button @tap="form.needPrint = 2" class="admin-button-com middle" :class="form.needPrint == 2? 'blue' : 'default'">不打</button>
           </tui-list-cell>
 
           <!--
@@ -167,11 +168,11 @@
         </text>
         <text class="price-number">¥<text class="large">{{ modifyPrice }}</text></text>
       </view>
-      <button class="admin-button-com blue middle" @click="confirmSubmit">提交</button>
+      <button class="admin-button-com blue big" @click="confirmSubmit">提交</button>
     </view>
 
     <view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
-    background:#3385ff;color:white;z-index:9999;position:fixed;bottom:160upx;right:40upx;border-radius:60upx;">{{calc=='add'?'+':'-'}}</view>
+    background:#3385ff;color:white;z-index:9999;position:fixed;bottom:170upx;right:40upx;border-radius:60upx;">{{calc=='add'?'+':'-'}}</view>
 
     </view>
   </view>
@@ -250,9 +251,6 @@ export default {
   },
   onLoad (option) {
 
-    //默认欠款是首选项
-    this.form.hasPay = 2
-
     this.kdType = option.kdType
 
     if (!this.getMerchantInfo) {
@@ -281,11 +279,14 @@ export default {
 
     }
 
+    //默认欠款是首选项
+    this.form.hasPay = 2
     // #ifdef APP-PLUS
     if(this.$util.isScanEnv()){
       this.isScanEnv = true
+      this.form.hasPay = 0
     }
-    // #endif
+	  //#endif
 
     this.listenScanItem()
 
@@ -450,7 +451,7 @@ export default {
 
 <style lang="scss" scoped>
 .admin-button-com {
-  margin-right: 20upx;
+  margin-right: 30upx;
 }
 .affirm-page {
   position: relative;

ghsApp/src/admin/billing/toPay.vue

@@ -37,8 +37,7 @@
         <view style="margin-top:35upx;">
             <button style="width:28vh;" @click="goBack()" class="admin-button-com big default">返回首页</button>
         </view>
-        <view v-if="orderInfo.orderType == 1" style="color:#CCCCCC;margin-top:20upx;">10分钟后未付款，订单自动变成欠款单 <text @click="cancelOrder()" style="color:#666666;margin-left:10upx;text-decoration:underline;">取消订单</text></view>
-        <view v-else style="color:#CCCCCC;margin-top:20upx;">客户下单，10分钟后未付款自动取消</view>
+        <view style="color:#CCCCCC;margin-top:20upx;">10分钟后未付款自动取消</view>
       </view>
     </view>
   </view>