shish 3 rokov pred
rodič
commit
666bda3f59

+ 2 - 2
ghsApp/src/admin/home/components/OrderItem.vue

@@ -185,11 +185,11 @@ export default {
   & > .other-book{
     text-align: center;
     color: white;
-    border:2upx solid green;
+    border:2upx solid orange;
     border-radius:30upx;
     padding:5upx 10upx;
     font-size:20upx;
-    background:green;
+    background:orange;
     margin-right:20upx;
     width:auto;
   }

+ 1 - 1
ghsApp/src/admin/home/login.vue

@@ -48,7 +48,7 @@
 				<!-- #endif -->
 				<view style="margin-top:80upx;color:#999999;width:86vw;font-size:35upx;">
 					<text style="float:right;" @click="pageTo({url: '/pagesClient/official/apply',type:2})">注册账号</text>
-					<text style="float:right;margin-right:25upx;" @click="useAccount()">使用账号密码登录</text>
+					<text style="float:right;margin-right:35upx;" @click="useAccount()">使用账号密码登录</text>
 				</view>
 			</view>
 			</view>

+ 6 - 58
ghsApp/src/admin/home/workbench.vue

@@ -1,8 +1,5 @@
 <template>
 <view>
-	<!-- #ifdef APP-PLUS -->
-	<keyboard-listener @keyup="onKeyup" @keydown="onKeydown"></keyboard-listener>
-	<!-- #endif -->
   <block v-if="loginStyle  == 0">
 	<!-- #ifdef MP-WEIXIN -->
     <view style="width:100vw;height:400upx;display:flex;align-items:center;justify-content:center;position:relative;">
@@ -15,12 +12,12 @@
     <view style="width:100vw;height:400upx;display:flex;align-items:center;justify-content:center;position:relative;">
 	<!-- #ifdef MP-WEIXIN -->
       <view style="position:absolute;top:60upx;font-size:35upx;">
-        <text style="color:#333333;margin-left:8upx;font-weight:bold;">批发店点这里登录</text>
+        <text style="color:#333333;margin-left:8upx;font-weight:bold;">批发店登录点这里</text>
       </view>
 	<!-- #endif -->
     <button class="admin-button-com big blue" style="width:260upx;" @click="pageTo({url:'/admin/home/login'})">去登录</button>
 
-	<text style="color:green;position:absolute;top:300upx;font-size:32upx;" @click="pageTo({url:'/admin/book/index'})">查看教学视频</text>
+	<text style="color:green;position:absolute;top:300upx;font-size:32upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">注册账号</text>
 
     </view>
   </block>
@@ -168,10 +165,6 @@
 </template>
 
 <script>
-//#ifdef APP-PLUS
-import keyboardListener from "@/components/keyboard-listener/keyboard-listener";
-const Uhf53Helper = uni.requireNativePlugin("Uhf53Helper");
-//#endif
 import { mapGetters,mapActions } from "vuex";
 import { getShopInfo } from "@/utils/auth";
 import { consoleIndex } from "@/api/workbench";
@@ -186,9 +179,7 @@ import { getErrorPrice } from "@/api/item"
 import { getStaffInfo } from "@/api/shop-admin"
 export default {
 	name: "workbench",
-	//#ifdef APP-PLUS
-	components: { keyboardListener },
-	//#endif
+	components: {  },
 	mixins: [productMins,autoUpdateMixins],
 	data() {
 		return {
@@ -227,9 +218,8 @@ export default {
 			//登录状态 0未登录 1登录
 			loginStyle :0,
 			errorPirceList:[],
-			lookMoney:1,
-			notifyNum:0,
-			switch:0
+			lookMoney:0,
+			notifyNum:0
 		};
 	},
 	onShareAppMessage(res) {
@@ -257,17 +247,6 @@ export default {
 		if(this.$util.isScanEnv()){
 			this.isScanEnv = true
 		}
-		//#ifdef APP-PLUS
-		//如果是rfid手持机
-		if(uni.getSystemInfoSync().brand == 'rockchip'){
-			let _this = this;
-			Uhf53Helper.initSdk(result => {
-				if (result) {
-					console.log(result)
-				}
-			})
-		}
-		//#endif
 	},
 	onPullDownRefresh() {
 		this.init();
@@ -278,6 +257,7 @@ export default {
 		if(!this.$util.isEmpty(this.loginInfo.admin) && this.loginInfo.admin.currentGhsShopId > 0){
 			this.loginStyle  = 1
 		}
+		this.setIndex()
 		getStaffInfo().then(res=>{
 			if(res.code == 1){
 				this.notifyNum = res.data.staff.notifyNum ? Number(res.data.staff.notifyNum) : 0
@@ -286,38 +266,6 @@ export default {
 	},
 	methods: {
 		...mapActions(['setUserShopAll']),
-		//#ifdef APP-PLUS
-		onKeydown(event) {
-			if(this.switch == 1){
-				return false
-			}
-			if (event.keyCode == 115 && event.type == 'keydown') {
-				console.log('已开启')
-				this.switch = 1
-				Uhf53Helper.startScan();
-			}
-		},
-		onKeyup(event) {
-			if(this.switch == 0){
-				return false
-			}
-			if (event.keyCode == 115 && event.type == 'keyup') {
-				console.log('已关闭')
-				this.switch = 0
-				Uhf53Helper.stopScan();
-			}
-		},
-		start() {
-			Uhf53Helper.startScan();
-		},
-		stop() {
-			Uhf53Helper.stopScan();
-		},
-		release() {
-			let _this = this;
-			Uhf53Helper.releaseUhfDevice();
-		},
-		//#endif
 		getShopName(){
 			currentShop().then(res => {
 				if(res.code == 1){

+ 2 - 0
ghsApp/src/admin/item/presell.vue

@@ -9,6 +9,7 @@
 				<text v-if="form.presell == 0">关闭</text><text v-else>开启</text>
 			</view>
           </tui-list-cell>
+<block v-if="form.presell == 1">
           <tui-list-cell class="line-cell" :hover="false">
 			<div class="tui-title">到货日期1</div>
 			<view class="tui-input" v-if="form.date1==''" @click="showDatePicker(1)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
@@ -33,6 +34,7 @@
 			<view class="tui-input" @click="showDatePicker(4)" style="width:350upx;" v-else>{{ form.date4 }}</view>
 			<button class="admin-button-com mini-btn blue" @click="form.date4=''">清空</button>
           </tui-list-cell>
+</block>
         </div>
         <div class="confirm-btn">
           <button class="admin-button-com big blue" formType="submit">保存修改</button>

+ 9 - 3
ghsApp/src/pagesOrder/detail.vue

@@ -65,10 +65,16 @@
 					<view>{{ detailInfo.cgInfo.orderSn }}</view>
 				</view>
 				<view class="order-info_box" v-if="detailInfo.book == 1">
-				<view>订单类型:</view>
-				<view>
-					<text style="color:white;border:1px solid green;border-radius:20upx;font-size:20upx;padding:5upx 12upx;background:green;">预订单</text>
+					<view>订单类型:</view>
+					<view>
+						<text style="color:white;border:1px solid orange;border-radius:20upx;font-size:20upx;padding:5upx 12upx;background:orange;">预订单</text>
+					</view>
 				</view>
+				<view class="order-info_box" v-if="detailInfo.presell == 1">
+					<view>订单类型:</view>
+					<view>
+						<text style="color:white;border:1px solid green;border-radius:20upx;font-size:20upx;padding:5upx 12upx;background:green;">预售单</text>
+					</view>
 				</view>
 <block v-if="detailInfo.localOrder && detailInfo.localOrder==1">
 	<view class="order-info_box">