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

+ 3 - 4
ghsPad/src/manifest.json

@@ -45,13 +45,12 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-                "idfa" : false            
+                "idfa" : false,
+                "dSYMs" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "speech" : {
-                    
-                },
+                "speech" : {},
                 "share" : {},
                 "ad" : {},
                 "geolocation" : {

+ 2 - 2
ghsPad/src/pages/home/cash.vue

@@ -185,7 +185,7 @@ export default {
 	}
 	& .nav-left {
 		flex: 5;
-		background-color: rgba(72, 91, 107, 1);
+		background-color:#3385FF;
 	}
 	& .itemList-box {
 		flex: 30;
@@ -199,7 +199,7 @@ export default {
 	height: 100vh;
 	& .nav-left {
 		flex: 5;
-		background-color: rgba(72, 91, 107, 1);
+		background-color:#3385FF;
 	}
     & .select-custom{
         flex: 119;

+ 1 - 1
ghsPad/src/pages/home/components/customerList.vue

@@ -6,7 +6,7 @@
       <block v-for="(item,index) in list" :key="item.id">
         <block v-if="index == 6">
             <view class="userList-item_box" @click.stop="fastKd()" 
-            style="background-color:green;border:1upx solid green;text-align:center;">
+            style="background-color:#3385FF;border:1upx solid #3385FF;text-align:center;">
               <view class="head-box">
                 <view class="name" style="color:white;font-size:20upx;font-weight:bold;">快捷开单</view>
               </view>

+ 1 - 1
ghsPad/src/pages/home/components/leftArea.vue

@@ -98,7 +98,7 @@ export default {
     & .title {
         padding: 3upx;
         font-size: 12upx;
-        background-color: rgba(72, 91, 107, 1);
+        background-color: #3385FF;
         color: #FFFFFF;
     }
     & .itemList-item_box {

+ 1 - 1
ghsPad/src/pages/home/components/leftGroup.vue

@@ -121,7 +121,7 @@ export default {
     & .title {
         padding: 3upx;
         font-size: 12upx;
-        background-color: rgba(72, 91, 107, 1);
+        background-color:#3385FF;
         color: #FFFFFF;
     }
     & .itemList-item_box {

+ 2 - 1
ghsPad/src/pages/home/components/nav.vue

@@ -134,7 +134,8 @@ export default {
   }
   & .selected{
     font-weight: bold;
-    color:#11eb7e;
+    color:white;
+    font-size:11upx;
   }
 }
 </style>

+ 1 - 1
ghsPad/src/pages/home/components/orderList.vue

@@ -166,7 +166,7 @@ export default {
     & .title {
         padding: 3upx;
         font-size: 12upx;
-        background-color: rgba(72, 91, 107, 1);
+        background-color: #3385FF;
         color: #FFFFFF;
     }
     & .order-status{

+ 1 - 1
ghsPad/src/pages/home/components/rightItem.vue

@@ -176,7 +176,7 @@ export default {
             white-space: nowrap;
             text-align: center;
             &.active {
-                background-color: #428369;
+                background-color: #3385FF;
                 color: #ffffff;
             }
         }

+ 1 - 1
ghsPad/src/pages/home/components/toPay.vue

@@ -15,7 +15,7 @@
                 <image style="width:40upx;height:40upx;position:absolute;top:190upx;left:205upx;" :src="`${constant.imgUrl}/icon/loading.gif`" v-if="goPay == 1" mode="scaleToFill" />
                 <view style="margin-top:30upx;">
                     <view @click="cancelPayFn" class="btn-default">取消</view>
-                    <view @click="reScan()" style="margin-left:20upx;background-color:#1c7b20;color:white;width:150upx;" class="btn-default">重新出示付款码</view>
+                    <!-- <view @click="reScan()" style="margin-left:20upx;background-color:#1c7b20;color:white;width:150upx;" class="btn-default">重新出示付款码</view> -->
                 </view>
             </view>
         </view>

+ 1 - 1
ghsPad/src/pages/home/order.vue

@@ -77,7 +77,7 @@ export default {
 	height: 100vh;
 	& .nav-left {
 		flex: 5;
-		background-color: rgba(72, 91, 107, 1);
+		background-color: #3385FF;
 	}
 	& .order-list {
 		flex: 32;

+ 2 - 2
ghsPad/src/pages/home/xj.vue

@@ -3,7 +3,7 @@
     <view>
         <view class="app-casher-area">
             <view class="nav-left">
-                <casherNav navType="xh"></casherNav>
+                <casherNav navType="xj"></casherNav>
             </view>
             <view class="work-list">
 				<view style="width:330upx;display: inline-block">
@@ -164,7 +164,7 @@ export default {
 	height: 100vh;
 	& .nav-left {
 		flex: 5;
-		background-color: rgba(72, 91, 107, 1);
+		background-color:#3385FF;
 	}
 	& .work-list {
 		flex: 121;

+ 2 - 4
ghsPad/src/utils/util.js

@@ -298,10 +298,9 @@ export const callUp = (mobile) =>{
 //没有库存时的语音播放 shish
 export const noStockRemind = () =>{
 	const innerAudioContext = uni.createInnerAudioContext()
-	innerAudioContext.autoplay = false
+	innerAudioContext.autoplay = true
 	innerAudioContext.volume = 1
 	innerAudioContext.src = "/static/noStock.mp3"
-	innerAudioContext.play()
 	innerAudioContext.onError(function() {
 		innerAudioContext.destroy()
 	})
@@ -318,9 +317,8 @@ export const noStockRemind = () =>{
 
 export const hitVoice = () =>{
 	const innerAudioContext = uni.createInnerAudioContext()
-	innerAudioContext.autoplay = false
+	innerAudioContext.autoplay = true
 	innerAudioContext.src = "/static/hit.mp3"
-	innerAudioContext.play()
 	innerAudioContext.onError(function() {
 		innerAudioContext.destroy()
 	})

+ 3 - 4
hdPad/src/manifest.json

@@ -65,13 +65,12 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                     }
-                }          
+                },
+                "dSYMs" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "speech" : {
-                    
-                },
+                "speech" : {},
                 "ad" : {},
                 "oauth" : {}
             },

+ 1 - 1
hdPad/src/pages/home/components/toPay.vue

@@ -15,7 +15,7 @@
                 <image style="width:40upx;height:40upx;position:absolute;top:190upx;left:205upx;" :src="`${constant.imgUrl}/icon/loading.gif`" v-if="goPay == 1" mode="scaleToFill" />
                 <view style="margin-top:30upx;">
                     <view @click="cancelPayFn" class="btn-default">取消</view>
-                    <view @click="reScan()" style="margin-left:20upx;background-color:#1c7b20;color:white;width:150upx;" class="btn-default">重新出示付款码</view>
+                    <!-- <view @click="reScan()" style="margin-left:20upx;background-color:#1c7b20;color:white;width:150upx;" class="btn-default">重新出示付款码</view> -->
                 </view>
             </view>
         </view>

+ 2 - 4
hdPad/src/utils/util.js

@@ -298,10 +298,9 @@ export const callUp = (mobile) =>{
 //没有库存时的语音播放 shish
 export const noStockRemind = () =>{
 	const innerAudioContext = uni.createInnerAudioContext()
-	innerAudioContext.autoplay = false
+	innerAudioContext.autoplay = true
 	innerAudioContext.volume = 1
 	innerAudioContext.src = "/static/noStock.mp3"
-	innerAudioContext.play()
 	innerAudioContext.onError(function() {
 		innerAudioContext.destroy()
 	})
@@ -318,9 +317,8 @@ export const noStockRemind = () =>{
 
 export const hitVoice = () =>{
 	const innerAudioContext = uni.createInnerAudioContext()
-	innerAudioContext.autoplay = false
+	innerAudioContext.autoplay = true
 	innerAudioContext.src = "/static/hit.mp3"
-	innerAudioContext.play()
 	innerAudioContext.onError(function() {
 		innerAudioContext.destroy()
 	})