Преглед изворни кода

Merge branch 'master' into ls

shish пре 1 година
родитељ
комит
eb50506bf3

+ 2 - 2
hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.7.6",
-    "versionCode" : 176,
+    "versionName" : "1.7.7",
+    "versionCode" : 177,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 3 - 2
hdPad/src/pages/home/components/console.vue

@@ -6,10 +6,11 @@
 	<view class="active" style="background-color:orange;color:white;border-color:orange;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;" @click="goSettleCommit">结算</view>
 	<view class="active" style="position:fixed;left:36upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:15upx;" @click="handOrder()" v-if="globalHasHand == 0">挂单</view>
 	<view class="active" style="position:fixed;left:36upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:15upx;color:white;background-color: #09C567;" @click="getHandOrder()" v-else>取单</view>
-    <view class="active" @click="toWastage">报损</view>
+    <view class="active" @click="toWastage" style="color:#f1a313;border:1upx solid #f1a313;">报损</view>
 	<view class="active" @click="selectCustom()">选客</view>
 	<view class="active" @click="getAllProduct()">扫码</view>
-    <view class="active" @click="clearItemFn">清空</view>
+	<view class="active" @click="gatheringFn()" style="color:#3385FF;border:1upx solid #3385FF;">收款</view>
+    <view class="active" @click="clearItemFn" style="color:#636161;border:1upx solid #636161;">清空</view>
 
 	<view v-if="Number(customId)>0" style="position:fixed;left:32upx;bottom:66upx;width:189upx;height:20upx;line-height:5upx;font-size:13upx;background-color:white;color:#09C567;font-weight:bold;border:none;">{{customName}}</view>
 

+ 2 - 2
开发/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.7.6",
-    "versionCode" : 176,
+    "versionName" : "1.7.7",
+    "versionCode" : 177,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
线上/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.7.6",
-    "versionCode" : 176,
+    "versionName" : "1.7.7",
+    "versionCode" : 177,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {