app 优化

ghsApp/src/admin/home/me.vue

@@ -12,7 +12,6 @@
               ID:{{ shopInfo.shopAdminId }}
             </view>
           </view>
-          <!-- <i class="iconfont iconxiangyou"></i> -->
         </view>
       </view>
       <view class="me-shop_box">
@@ -84,10 +83,6 @@
               <div class="tui-title">提现账号</div>
             </tui-list-cell>
 
-            <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expressSet' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">快递设置</div>
-            </tui-list-cell>
-
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
               <div class="tui-title">打印机设置</div>
             </tui-list-cell>
@@ -95,15 +90,14 @@
             <tui-list-cell @click="pageTo({ url: '/admin/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">
               <div class="tui-title">云喇叭设置</div>
             </tui-list-cell>
-
-            <tui-list-cell @click="getCustomService()" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">联系我们</div>
+            <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expressSet' })" class="line-cell" :hover="false" :arrow="true">
+              <div class="tui-title">快递设置</div>
             </tui-list-cell>
-
+            <!-- #ifdef APP-PLUS -->
             <tui-list-cell @click="loginOut()" class="line-cell" :hover="false" :arrow="true">
               <div class="tui-title">退出</div>
             </tui-list-cell>
-
+            <!-- #endif -->
           </view>
         </view>
         <none-hd :show="no_shop_show_model" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
@@ -151,25 +145,6 @@ export default {
     }
   },
   methods: {
-		getCustomService(){
-			let self = this;
-			uni.showModal({
-				title: "客服电话微信",
-				content: "15280215347",
-				cancelText: "取消",
-				confirmText: "复制",
-				success: function (res) {
-					if (res.confirm) {
-						uni.setClipboardData({
-							data: "15280215347",
-							success: function() {
-								self.$msg("已复制")
-							}
-						});
-					}
-				},
-			})
-		},
     shopShow () {
       this.shopId = this.getLoginInfo.shopId;
       this.$refs.dorpdownSelect.dropdownShow = true;
@@ -194,7 +169,7 @@ export default {
           confirmText: "确认",
           success: function (res) {
             if (res.confirm) {
-              uni.removeStorageSync('token')
+              uni.clearStorage()
               that.$store.commit("setLoginInfo", {})
               that.$util.pageTo({url: "/admin/home/workbench",type: 3})              
             }

ghsApp/src/admin/item/detail.vue

@@ -607,9 +607,7 @@ export default {
       let checkRes = form.validation(formData, rules);
       // 验证通过!
       if (!checkRes) {
-        setTimeout(() => {
-          this.confirmFn();
-        });
+          this.confirmFn()
       } else {
         this.$msg(checkRes);
       }

ghsApp/src/mixins/globalMixins.js

@@ -196,6 +196,13 @@ export default {
 			this.globalPDAKd(productIdCode)
 		},
     globalPDAKd(productIdCode){
+
+      //没有登陆直接扫码
+      if(this.$util.isEmpty(this.getLoginInfo)){
+        this.$msg('您还没有登陆')
+        return false
+      }
+
       var pages = getCurrentPages()
 			let currentRoute  = pages[pages.length-1].route;
 
@@ -229,7 +236,8 @@ export default {
       let index = this.allProduct.findIndex(ele => Number(ele.id) == Number(productIdCode))
       if(index == -1){
         this.$util.noStockRemind()
-        this.$msg('没有找到花材')
+        this.$msg('没有找到花材..')
+        return false
       }
       let currentProduct = this.allProduct[index]
       

ghsApp/src/pages.json

@@ -258,7 +258,7 @@
 		{
 			"root": "pagesStorehouse/stockWarn/",
 			"pages": [
-				{ "path": "manage", "style": { "navigationBarTitleText": "库存预警", "enablePullDownRefresh": true } },
+				{ "path": "manage", "style": { "navigationBarTitleText": "库存预警" } },
 				{ "path": "detailed", "style": { "navigationBarTitleText": "库存明细", "enablePullDownRefresh": true } }
 			]
 		},

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -1,19 +1,6 @@
 <template>
+<view class="app-content">
 	<view class="ex-page">
-		<view class="top-bar" v-if="false">
-				<DorpdownSelect class="bar"
-					:menuObj="menuTimeObj"
-					:typeTime="true"
-					:selectItemId.sync="selectTimeId"
-					:typeSelect="1" top="0upx"
-					@selectSussess="selectSussess" />
-
-			<DorpdownSelect class="bar"
-				:menuObj.sync="menuObj"
-				:selectItemId.sync="shopId"
-				top="0"
-				@selectSussess="selectShopSussess" />
-		</view>
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 				<block v-if="!$util.isEmpty(list.data)">
@@ -46,17 +33,8 @@
 				</block>
 			</view>
 		</scroll-view>
-
-		<!--时间段选择-->
-		<rangeDatePick
-			:show="isShow"
-			start="2000-01-01"
-			end="2200-12-01"
-			:value="customizationTime"
-			@change="timeChange"
-			@cancel="timeCancel"
-			themeColor="#4C83D6" fields="day"></rangeDatePick>
 	</view>
+</view>
 </template>
 <script>
 const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1
@@ -66,11 +44,9 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import SelectList from "@/components/plugin/selectList";
 import { getStockDetailApi } from "@/api/storehouse/stock";
 import { list,selectShop } from "@/mixins";
-import DorpdownSelect from "@/components/module/shopSelect";
-import rangeDatePick from '@/components/pyh-rdtpicker/pyh-rdtpicker.vue';
 import {mapActions, mapGetters} from "vuex";
 export default {
-	components: { SelectList, AppWrapperEmpty,DorpdownSelect,rangeDatePick },
+	components: { SelectList, AppWrapperEmpty},
 	mixins: [list,selectShop],
 	computed: {		...mapGetters(["getDictionariesInfo","getLoginInfo"])	},
 	data() {
@@ -166,10 +142,12 @@ export default {
 		this.params.id = e.id;
 		let dateDefaultOption = [];
 		let list = this.getDictionariesInfo.dateDefaultOption;
-		for (let i=0;i<list.length;i++){
-			dateDefaultOption.push({name:list[i].name,id:list[i].value})
+		if(!this.$util.isEmpty(list)){
+			for (let i=0;i<list.length;i++){
+				dateDefaultOption.push({name:list[i].name,id:list[i].value})
+			}
+			this.menuTimeObj = {title:'今天',titleChild:'时间',list: dateDefaultOption}
 		}
-		this.menuTimeObj = {title:'今天',titleChild:'时间',list: dateDefaultOption};
 		this.shopId = this.getLoginInfo.shopId;
 	},
 	onReachBottom() {