app 优化

ghsApp/src/admin/billing/affirm.vue

@@ -338,9 +338,11 @@ export default {
 		},
     // #endif
 		reduceItemFn(item) {
+      this.kdType = 'HIT';
 			this.replaceItemFn(item,0,'sub')
 		},
 		addItemFn (item) {
+      this.kdType = 'HIT';
 			this.replaceItemFn(item,0,'add')
 		},
     init () {

ghsApp/src/admin/cg/set.vue

@@ -88,8 +88,8 @@ export default {
             setTimeout(function(){
               //这个切换得更彻底
               that.$store.commit("setLoginInfo", {})
-              that.$util.pageTo({url: "/admin/cg/set",type: 3})
-            },900);
+              that.$util.pageTo({url: "/admin/home/workbench",type: 3})
+            },1000);
           }
       })
     }

ghsApp/src/api/storehouse/stock.js

@@ -29,8 +29,8 @@ export const getStockInDetailApi = async orderSn => {
 /** *
  * 入库列表
  */
-export const getStockInListApi = async status => {
-	return https.get("/stock-in/list", { status });
+export const getStockInListApi = async data => {
+	return https.get("/stock-in/list", data);
 };
 
 /** *
@@ -50,8 +50,8 @@ export const createStockOutOrderApi = async data => {
 /** *
  * 出库列表
  */
-export const getStockOutListApi = async status => {
-	return https.get("/stock-out/list", { status });
+export const getStockOutListApi = async data => {
+	return https.get("/stock-out/list", data);
 };
 
 /** *

ghsApp/src/manifest.json

@@ -22,7 +22,8 @@
         },
         "modules" : {
             "VideoPlayer" : {},
-            "Bluetooth" : {}
+            "Bluetooth" : {},
+            "Geolocation" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -31,8 +32,10 @@
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>"
+                    "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
+                    "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
                 "autoSdkPermissions" : true
             },
@@ -50,7 +53,13 @@
                     "unipush" : {}
                 },
                 "share" : {},
-                "ad" : {}
+                "ad" : {},
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "maps" : {}
             },
             "orientation" : [ "portrait-primary" ],
             "icons" : {
@@ -89,28 +98,28 @@
         "nativePlugins" : {
             "G5KJ-ShangMiPrint" : {
                 "__plugin_info__" : {
-                    "name" : "商米内置打印机与扫码 - [试用版，仅用于自定义调试基座]",
+                    "name" : "商米内置打印机与扫码",
                     "description" : "实现商米内置打印机与外接usb扫码枪识别",
                     "platforms" : "Android",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=3514",
-                    "android_package_name" : "",
+                    "android_package_name" : "zhh.huahuibao.app",
                     "ios_bundle_id" : "",
                     "isCloud" : true,
-                    "bought" : 0,
+                    "bought" : 1,
                     "pid" : "3514",
                     "parameters" : {}
                 }
             },
             "Html5app-Gprinter" : {
                 "__plugin_info__" : {
-                    "name" : "Android 和 IOS 佳博 蓝牙小票 标签 打印插件 - [试用版，仅用于自定义调试基座]",
+                    "name" : "Android 和 IOS 佳博 蓝牙小票 标签 打印插件",
                     "description" : "Android / IOS 佳博小票 、标签 打印机插件，QQ交流群：891416757",
                     "platforms" : "Android,iOS",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=462",
-                    "android_package_name" : "",
+                    "android_package_name" : "zhh.huahuibao.app",
                     "ios_bundle_id" : "",
                     "isCloud" : true,
-                    "bought" : 0,
+                    "bought" : 1,
                     "pid" : "462",
                     "parameters" : {}
                 }

ghsApp/src/mixins/globalMixins.js

@@ -48,6 +48,13 @@ export default {
 		}
     uni.setStorageSync('currentQuery', JSON.stringify(option))
 
+    //pda监听获取不到option，通过存到storage传进去
+    if(option.customId){
+      uni.setStorageSync('pdaCustomId', option.customId)
+    }else{
+      uni.removeStorageSync('pdaCustomId')
+    }
+
 		if(this.$util.isEmpty(this.getLoginInfo)){
 
       // #ifdef MP-WEIXIN
@@ -203,8 +210,9 @@ export default {
       let pageType = "bill"
 
       let currentCustomId = that.skCustomId || 0
-      if(!this.$util.isEmpty(this.option.customId) && currentRoute == 'admin/billing/affirm'){
-        currentCustomId = this.option.customId
+      let pdaCustomId = uni.getStorageSync('pdaCustomId')
+      if(!this.$util.isEmpty(pdaCustomId) && currentRoute == 'admin/billing/affirm'){
+        currentCustomId = pdaCustomId
       }
       if(currentCustomId == 0){
         this.$util.noStockRemind()
@@ -212,8 +220,8 @@ export default {
       }
 
       //涉及记住花材的代码和流程，请全项目搜索关键词remember_item
-			if(uni.getStorageSync('selectList_'+pageType+'_custom_'+currentCustomId)){
-				this.setSelectInfoByType({ type: pageType, info: uni.getStorageSync('selectList_'+pageType+'_custom_'+currentCustomId)})
+			if(uni.getStorageSync('selectList_'+pageType+'_target_'+currentCustomId)){
+				this.setSelectInfoByType({ type: pageType, info: uni.getStorageSync('selectList_'+pageType+'_target_'+currentCustomId)})
 			}
 
       let currentList = this.getSelectInfo[this.pageType] || [];
@@ -258,7 +266,7 @@ export default {
         currentItem = currentList[storeIndex]
       }
 
-      uni.setStorageSync('selectList_'+pageType+'_custom_'+currentCustomId, currentList)
+      uni.setStorageSync('selectList_'+pageType+'_target_'+currentCustomId, currentList)
       that.setSelectInfoByType({ type: pageType, info: currentList })
 
       if(currentRoute != 'admin/billing/affirm'){

ghsApp/src/mixins/product.js

@@ -110,12 +110,12 @@ export default {
 				//由于价格会变化，所以在initData()重新载入已经选择的花材
 			}
 		}else if(this.pageType == 'bill' && !this.$util.isEmpty(this.option.customId)){
-			if(uni.getStorageSync('selectList_'+this.pageType+'_custom_'+this.option.customId)){
+			if(uni.getStorageSync('selectList_'+this.pageType+'_target_'+this.option.customId)){
 				//由于价格会变化，所以在initData()重新载入已经选择的花材
 			}
 		}else if(this.pageType == 'purchase' && !this.$util.isEmpty(this.option.ghsId)){
-			if(uni.getStorageSync('selectList_'+this.pageType+'_ghs_'+this.option.ghsId)){
-				this.setSelectInfoByType({ type: this.pageType, info: uni.getStorageSync('selectList_'+this.pageType+'_ghs_'+this.option.ghsId) })
+			if(uni.getStorageSync('selectList_'+this.pageType+'_target_'+this.option.ghsId)){
+				this.setSelectInfoByType({ type: this.pageType, info: uni.getStorageSync('selectList_'+this.pageType+'_target_'+this.option.ghsId) })
 			}
 		}else{
 			//盘点和报损等不需要考虑价格
@@ -135,10 +135,10 @@ export default {
 		rememberProduct(){
 			if(this.pageType == 'bill' && !this.$util.isEmpty(this.option.customId)){
 				//开单根据客户记住已选的花材
-				uni.setStorageSync('selectList_'+this.pageType+'_custom_'+this.option.customId, this.selectList)
+				uni.setStorageSync('selectList_'+this.pageType+'_target_'+this.option.customId, this.selectList)
 			}else if(this.pageType == 'purchase' && !this.$util.isEmpty(this.option.ghsId)){
 				//采购根据供应商记住已选的花材
-				uni.setStorageSync('selectList_'+this.pageType+'_ghs_'+this.option.ghsId, this.selectList)
+				uni.setStorageSync('selectList_'+this.pageType+'_target_'+this.option.ghsId, this.selectList)
 			}else{
 				uni.setStorageSync('selectList_'+this.pageType, this.selectList)
 			}
@@ -161,7 +161,7 @@ export default {
 		removeMemoryDirect(customId=0){
 			let that = this
 			if(customId!=0){
-				uni.removeStorageSync('selectList_'+that.pageType+'_custom_'+customId)
+				uni.removeStorageSync('selectList_'+that.pageType+'_target_'+customId)
 			}else{
 				uni.removeStorageSync('selectList_'+that.pageType)
 			}
@@ -221,8 +221,8 @@ export default {
 					}
 				}else if(this.pageType == 'bill' && !this.$util.isEmpty(this.option.customId)){
 					//开单记忆花材取出到selectList
-					if(uni.getStorageSync('selectList_'+this.pageType+'_custom_'+this.option.customId)){
-						let currentInfo = uni.getStorageSync('selectList_'+this.pageType+'_custom_'+this.option.customId)
+					if(uni.getStorageSync('selectList_'+this.pageType+'_target_'+this.option.customId)){
+						let currentInfo = uni.getStorageSync('selectList_'+this.pageType+'_target_'+this.option.customId)
 						if(!this.$util.isEmpty(currentInfo)){
 							currentInfo.forEach((currentItem,currentIndex,currentArray)=>{
 								let currentId = currentItem.id

ghsApp/src/pagesClient/member/detail.vue

@@ -203,8 +203,9 @@ export default {
     },
 		navigate(latitude, longitude, address) {   
 			// 将经纬度转换成Number
-			let latituded = Number(latitude);
-			let longituded = Number(longitude);					
+			let latituded = Number(latitude)
+			let longituded = Number(longitude)
+      console.log(latituded+'_'+longituded)
 			uni.openLocation({
 				latitude: latituded,
 				longitude: longituded,

ghsApp/src/pagesPurchase/add.vue

@@ -9,7 +9,7 @@
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" @click="removeMemory(0)">清除采购</button>
+				<button class="admin-button-com middle blue" @click="removeMemory(option.ghsId)">清除采购</button>
 			</view>
 		</view>
 

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -67,7 +67,6 @@
 		</checkbox-group>
 	</view>
 	<button class="admin-button-com big blue" style="width:80%;margin-top:50upx;" @click="commitChange">确认修改</button>
-	<button class="flex-center goHome" @click="pageTo({url:'/pagesPurchase/info',query:{orderSn:option.orderSn},type:3})" >订单详情</button>
 	<navigator open-type="switchTab" class="flex-center goHome" @click="goBackHome" >返回首页</navigator>
   </appResult>
 </template>

ghsApp/src/pagesPurchase/details.vue

@@ -45,19 +45,19 @@
 						<view v-else>{{ form.entryTime || "默认今天" }}</view>
 					</tui-list-cell>
 
-					<tui-list-cell v-if="myShopInfo.cgModel == 0" class="line-cell" :hover="false">
+					<tui-list-cell v-if="getLoginInfo.cgModel == 0" class="line-cell" :hover="false">
 						<view class="tui-title ">打包费</view>
 						<input type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.packingCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
 
-					<tui-list-cell v-if="myShopInfo.cgModel == 0" class="line-cell" :hover="false" :arrow="false">
+					<tui-list-cell v-if="getLoginInfo.cgModel == 0" class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title">运费支付</view>
 						<button @click="changeYfPayWay(1)" class="admin-button-com mini-btn" :class="form.yfPayWay == 1 ? 'blue' : 'default'">寄付</button>
 						<button @click="changeYfPayWay(2)" class="admin-button-com mini-btn" :class="form.yfPayWay == 2 ? 'blue' : 'default'" style="margin-left:20upx;">到付</button>
 					</tui-list-cell>
 				</view>
 
-				<view v-if="myShopInfo.cgModel == 0" class="module-com input-line-wrap">
+				<view v-if="getLoginInfo.cgModel == 0" class="module-com input-line-wrap">
 
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">短途运费</view>
@@ -70,7 +70,7 @@
 
 				</view>
 
-				<view v-if="myShopInfo.cgModel == 0" class="module-com input-line-wrap">
+				<view v-if="getLoginInfo.cgModel == 0" class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">提货费</view>
 						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.pickCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
@@ -104,7 +104,7 @@
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">每公斤运费</view>
-						<view v-if="myShopInfo.cgModel == 0">{{perKgFreight}}</view>
+						<view v-if="getLoginInfo.cgModel == 0">{{perKgFreight}}</view>
 						<input v-else style="border: 1upx solid #eee;color: #3385FF;width: calc(100%);height:70upx;"  type="digit" :disabled="!canIEdit"  @focus="form.avgKgWeight=''" v-model="form.avgKgWeight" placeholder-class="phcolor" class="tui-input" name="avgKgWeight" placeholder="请输入每公斤的运费成本"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
@@ -176,7 +176,7 @@ export default {
 	},
 	onLoad(option) {
 		this.form.ghsId = option.ghsId
-		if(this.myShopInfo.cgModel == 1){
+		if(this.getLoginInfo.cgModel == 1){
 			this.form.avgKgWeight = this.myShopInfo.cgPerCost
 		}
 		this.initData();
@@ -327,7 +327,7 @@ export default {
 				if (!this.getMerchantInfo) {
 					await this.initMerchantInfo();
 				}
-				const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.myShopInfo.cgModel});
+				const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.getLoginInfo.cgModel});
 				uni.setStorageSync('flowersItemInfo', itemInfo);
 				
 				this.removeMemoryDirect()

ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -100,12 +100,21 @@ export default {
 		this.resetList();
 		this.initData();
 	},
+	onReachBottom() {
+		if (!this.list.finished) {
+		this._list().then((res) => {
+			uni.stopPullDownRefresh();
+		});
+		} else {
+		uni.stopPullDownRefresh();
+		}
+	},
 	methods: {
 		async initData() {
 			this._list();
 		},
 		_list() {
-			return getStockOutListApi(this.tabs[this.tabIndex].key)
+			return getStockOutListApi({status:this.tabs[this.tabIndex].key,page: this.list.page})
 				.then(res => {
 					this.completes(res);
 				})

ghsApp/src/pagesStorehouse/allot/allotPut.vue

@@ -98,12 +98,21 @@ export default {
 	onLoad() {
 		// this.init();
 	},
+	onReachBottom() {
+		if (!this.list.finished) {
+		this._list().then((res) => {
+			uni.stopPullDownRefresh();
+		});
+		} else {
+		uni.stopPullDownRefresh();
+		}
+	},
 	methods: {
 		async init() {
 			this._list();
 		},
 		_list() {
-			return getStockInListApi(this.tabs[this.tabIndex].key)
+			return getStockInListApi({status:this.tabs[this.tabIndex].key,page: this.list.page})
 				.then(res => {
 					this.completes(res);
 				})
@@ -160,7 +169,7 @@ export default {
 	.allot-list {
 		margin-top: 20upx;
 		flex: 1;
-		padding-bottom: 150upx;
+		padding-bottom: 30upx;
 		.allot-item {
 			margin-bottom: 1upx;
 			padding: 30upx;