shish hace 4 años
padre
commit
1d1038617d

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

@@ -57,7 +57,9 @@
               <view class="kc"><text class="unit_price">库存 {{ parseFloat(customData.stock) }}</text><text class="unit_price"> 单价 {{ parseFloat(customData.price) }}</text>1扎={{customData.ratio}}支</view>
 
               <view class="num_bx">
-                <input style="width: 430upx" v-model="customData.userPrice" @focus="customData.userPrice = null" type="number" placeholder="单价" />
+                <input style="width: 430upx" v-model="customData.userPrice" @focus="customData.userPrice = null"
+                v-if="getLoginInfo.staff && getLoginInfo.staff.super == 1" type="number" placeholder="单价" :disabled="false" />
+                <input style="width: 430upx" v-model="customData.userPrice" v-else @focus="customData.userPrice = null" type="number" :disabled="true" placeholder="单价" />
                 <text style="font-size:35upx;font-weight:bold;color:#666666;">元</text>
               </view>
 
@@ -529,7 +531,7 @@ export default {
 				align-items: center;
 				& .iconfont {
 					color: #3385ff;
-					font-size: 42upx;
+					font-size: 50upx;
 				}
 
 				.position{

+ 6 - 1
ghsApp/src/admin/billing/index.vue

@@ -65,7 +65,10 @@
 						<text>{{customData.ratio}}{{customData.smallUnit}}/{{customData.bigUnit}}</text>
 					</view>
 					<view class="num_bx">
-						<input style="width: 280upx" v-model="customData.userPrice" @focus="customData.userPrice = null" type="digit" placeholder="单价" />
+						<input style="width: 280upx" v-model="customData.userPrice" v-if="getLoginInfo.staff && getLoginInfo.staff.super == 1" @focus="customData.userPrice = null" 
+						:disabled="false" type="digit" placeholder="单价" />
+						<input style="width: 280upx" v-model="customData.userPrice" v-else @focus="customData.userPrice = null" 
+						:disabled="true" type="digit" placeholder="单价" />
 						<text style="font-size:35upx;font-weight:bold;color:#666666;">元</text>
 					</view>
 					<view class="num_bx">
@@ -106,6 +109,7 @@ import FooterCart from "@/components/module/app-footer-cart";
 import ModalModule from "@/components/plugin/modal";
 import { COMMODITY_TYPE } from "@/utils/declare";
 import productMins from "@/mixins/product";
+import { mapGetters } from "vuex";
 export default {
 	name: "Billing",
 	components: {
@@ -125,6 +129,7 @@ export default {
 		};
 	},
 	computed: {
+		...mapGetters(["getLoginInfo"]),
 	},
 	onShow() {
 

+ 1 - 1
ghsApp/src/components/module/app-commodity.vue

@@ -162,7 +162,7 @@ export default {
 				align-items: center;
 				& .iconfont {
 					color: #3385ff;
-					font-size: 42upx;
+					font-size: 50upx;
 				}
 				.position{
 					display: block;

+ 21 - 22
ghsApp/src/utils/util.js

@@ -311,32 +311,31 @@ export const callUp = (mobile) =>{
 
 //没有库存时的语音播放 shish
 export const noStockRemind = () =>{
-	const innerAudioContext = uni.createInnerAudioContext()
-	innerAudioContext.autoplay = false
-	innerAudioContext.src = "/static/noStock.mp3"
-	innerAudioContext.volume = 1
-	innerAudioContext.onPlay()
-	innerAudioContext.onError()
-	innerAudioContext.onPause(function() {
-		innerAudioContext.destroy()
-	})
-	innerAudioContext.play()
+	if(uni.getSystemInfoSync().platform != 'windows'){
+		const innerAudioContext = uni.createInnerAudioContext()
+		innerAudioContext.autoplay = true
+		innerAudioContext.src = "/static/noStock.mp3"
+		innerAudioContext.volume = 1
+		innerAudioContext.onPlay()
+		innerAudioContext.onError()
+		innerAudioContext.onPause(function() {
+			innerAudioContext.destroy()
+		})
+	}
 }
 
 //点击声效 shish
 export const hitRemind = () =>{
-	//微信PC端会报错,不要使用
-	//#ifdef APP-PLUS
-	const innerAudioContext = uni.createInnerAudioContext()
-	innerAudioContext.autoplay = false
-	innerAudioContext.src = "/static/hit.mp3"
-	innerAudioContext.onPlay()
-	innerAudioContext.onError()
-	innerAudioContext.onPause(function() {
-		innerAudioContext.destroy()
-	})
-	innerAudioContext.play()
-	//#endif
+	if(uni.getSystemInfoSync().platform != 'windows'){
+		const innerAudioContext = uni.createInnerAudioContext()
+		innerAudioContext.autoplay = true
+		innerAudioContext.src = '/static/hit.mp3'
+		innerAudioContext.onPlay()
+		innerAudioContext.onError()
+		innerAudioContext.onPause(function() {
+			innerAudioContext.destroy()
+		})
+	}
 }
 
 //去重 姜枫 2021.05.05

+ 0 - 2
hdApp/src/mixins/cgProduct.js

@@ -626,8 +626,6 @@ export default {
 				}
 			}
 
-			console.log('花材列表',list)
-
 			this.setSelectInfoByType({ type: this.pageType, info: list });
 
 			console.log('this.selectList',this.selectList)

+ 1 - 2
hdApp/src/pagesPurchase/components/item.vue

@@ -270,9 +270,8 @@ export default {
 				display: flex;
 				align-items: center;
 				& .iconfont {
-					//margin-left: 15upx;
 					color: #3385ff;
-					font-size: 42upx;
+					font-size: 50upx;
 				}
 				.position{
 					display: block;

+ 13 - 13
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -6,22 +6,22 @@
         <image :src="ghsInfo.avatar"></image>
 
         <view class="shop_info">
-					<view class="shop_title" @click="pageTo({url:'/pagesPurchase/level?id='+ghsInfo.id})"> {{ghsInfo.name}} </view>
+			<view class="shop_title" @click="pageTo({url:'/pagesPurchase/level?id='+ghsInfo.id})"> {{ghsInfo.name}} </view>
 
-					<view v-if="ghsInfo.hasRechargeHb && ghsInfo.hasRechargeHb ==1" class="shop_intro" @tap="recharge(ghsInfo)">
-						<text>充值得<text style="color:red;font-weight:700;">{{parseFloat(ghsInfo.hasRechargeHbAmount)}}</text>元红包
-							<text style="z-index:999999;margin-left:15upx;color:red;color: #3385FF;">点我充值</text>
-						</text>
-					</view>
+			<view v-if="ghsInfo.hasRechargeHb && ghsInfo.hasRechargeHb ==1" class="shop_intro" @tap="recharge(ghsInfo)">
+				<text>充值得<text style="color:red;font-weight:700;">{{parseFloat(ghsInfo.hasRechargeHbAmount)}}</text>元红包
+					<text style="z-index:999999;margin-left:15upx;color:red;color: #3385FF;">点我充值</text>
+				</text>
+			</view>
 
-					<view v-else class="shop_intro">
-						<text style="margin-right: 20upx;">已采购:{{ghsInfo.expendAmount || '0.00'}}</text>
-						<text>欠账:{{ghsInfo.debtAmount || '0.00'}}</text>
-					</view>
+			<view v-else class="shop_intro">
+				<text style="margin-right: 20upx;">已采购:{{ghsInfo.expendAmount || '0.00'}}</text>
+				<text>欠账:{{ghsInfo.debtAmount || '0.00'}}</text>
+			</view>
         </view>
 
-				<i class="iconfont icondianhua1" style="font-size:55upx;color:#6da3f5;position:absolute;top:45upx;" v-if="ghsInfo.mobile !=''" @tap="toPhone(ghsInfo.mobile)"></i>
-				<image v-if="tjFl == 1" class="hbImg" :src="`${constant.imgUrl}/icon/hb128.png`" mode="widthFix" @click="invite()"></image>
+		<i class="iconfont icondianhua1" style="font-size:55upx;color:#6da3f5;position:absolute;top:45upx;" v-if="ghsInfo.mobile !=''" @tap="toPhone(ghsInfo.mobile)"></i>
+		<image v-if="tjFl == 1" class="hbImg" :src="`${constant.imgUrl}/icon/hb128.png`" mode="widthFix" @click="invite()"></image>
         <view v-if="tjFl == 1" class="hbInfo" @click="invite()">邀请得红包</view>
       </view>
     </view>
@@ -934,7 +934,7 @@ export default {
 				align-items: center;
 				& .iconfont {
 					color: #3385ff;
-					font-size: 42upx;
+					font-size: 50upx;
 				}
 
 				.position{