app 优化

ghsApp/src/admin/breakage/index.vue

@@ -7,7 +7,6 @@
 			<view style="float:right">
 				<button class="admin-button-com middle blue" @click="removeMemory(0)">清除花材</button>
 			</view>
-
 		</view>
 		
 		<view class="scroll-middle_bx">
@@ -31,7 +30,6 @@
 								<Commondity v-if="classItem.isActive"
 									:checkStock="true"
 									:info="productItem"
-									:storeItem="getSelectItemById(productItem.id, classItem.classId)"
 									@showAddModel="showAddModel"
 									@add="addEvent"
 									@groupDataBeforeShowModel="groupInfoBeforeShowModel"
@@ -48,7 +46,7 @@
 			</scroll-view>
 
 		</view>
-		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="isModel" @cancel="modalCancel" @click="wastageConfrim" :title="customData.itemName" color="#333" :size="32" padding="30upx 30upx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"><text class="unit_price">库存 {{ customData.stock }}</text></view>
@@ -105,6 +103,7 @@ export default {
 			customData: {
 				bigCount: 0,
 				smallCount: 0,
+				userPrice:0
 			},
 			showSubmitModel: false
 		};
@@ -130,8 +129,8 @@ export default {
 			this.customData = info;
 			this.isFocus = false;
 			this.$nextTick(()=>{
-				this.customData.smallCount =	this.customData.smallCount==0?null:this.customData.smallCount;
-				this.customData.bigCount =	this.customData.bigCount==0?null:this.customData.bigCount;
+				this.customData.smallCount = this.customData.smallCount==0?null:this.customData.smallCount;
+				this.customData.bigCount = this.customData.bigCount==0?null:this.customData.bigCount;
 				this.isFocus = true;
 			})
 		},
@@ -140,7 +139,7 @@ export default {
 			this.customData = {};
 		},
 		// 取消 确认
-		affirm(val) {
+		wastageConfrim(val) {
 
 				if (val.index === 0) {
 					if(this.customData.bigCount>0 || this.customData.smallCount>0){
@@ -151,7 +150,6 @@ export default {
 					return false
 				}
 
-
 				//二个都不是数值
 				if(/(^[1-9]\d*$)/.test(this.customData.bigCount) == false && /(^[1-9]\d*$)/.test(this.customData.smallCount) == false){
 					this.delCurrentItem(this.customData)
@@ -346,4 +344,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

ghsApp/src/admin/changePrice/components/Item.vue

@@ -2,7 +2,7 @@
 <view class="product">
 	<view class="item-cmd_bx" :class="[info.status ==2?'sold-out':'']">
 		<view class="img_bx">
-			<app-img :src="info.cover" alt="" mode="aspectFit" :height="160" />
+			<image :src="info.cover" style="width:160upx;height:160upx;"></image>
 		</view>
 		<view class="cmd-info_bx" @click="pageTo({url: '/admin/item/detail',query: {id: info.id}})">
 			<view class="tit">{{ info.itemName || "" }}</view>
@@ -24,11 +24,9 @@
 
 <script>
 import { STOCK_TYPE } from "@/utils/declare";
-import AppImg from "@/components/app-img";
 export default {
 	name: "Commodity",
 	components: {
-		AppImg
 	},
 	props: {
 		type: {

ghsApp/src/admin/changePrice/list.vue

@@ -46,7 +46,6 @@
 
 	</view>
 </template>
-
 <script>
 import AppSearchModule from "@/components/module/app-search";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
@@ -82,49 +81,43 @@ export default {
 	},
 	methods: {
 		downloadTable(){
-
 			let level = 0
 			let levelList = ['散客价', '普店价', '银店价','金店价']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {
 					level = respond.tapIndex
-
-						uni.showLoading({title:'下载中',mask:true})
-						generatePriceTable({level:level}).then(res => {
-							if(res.code == 1){
-								uni.hideLoading()
-								let file = res.data.file
-								let shortFile = res.data.shortFile
-								uni.downloadFile({
-									url: file,
-									header: {"Content-Type": 'application/vnd.ms-excel'},
-									filePath: `${wx.env.USER_DATA_PATH}/${shortFile}`,
-									success: (res) => {
-										if (res.statusCode === 200) {
-											wx.saveFileToDisk({
-												filePath: res.filePath,
-												success: function(res) {
-													console.log(res)
-												},
-												fail:function(res) {
-													console.log(res)
-												}
-											})
-										}
-									},
-									fail:()=>{
-										uni.showToast({title:'请用电脑打开小程序下载',mask:true,icon:'none'})
+					uni.showLoading({title:'下载中',mask:true})
+					generatePriceTable({level:level}).then(res => {
+						if(res.code == 1){
+							uni.hideLoading()
+							let file = res.data.file
+							let shortFile = res.data.shortFile
+							uni.downloadFile({
+								url: file,
+								header: {"Content-Type": 'application/vnd.ms-excel'},
+								filePath: `${wx.env.USER_DATA_PATH}/${shortFile}`,
+								success: (res) => {
+									if (res.statusCode === 200) {
+										wx.saveFileToDisk({
+											filePath: res.filePath,
+											success: function(res) {
+												console.log(res)
+											},
+											fail:function(res) {
+												console.log(res)
+											}
+										})
 									}
-								});
-							}					
-						})
-
-
+								},
+								fail:()=>{
+									uni.showToast({title:'请用电脑打开小程序下载',mask:true,icon:'none'})
+								}
+							});
+						}					
+					})
 				}
 			})
-
-
 		},
 		initProduct(){
 			this.shopId = this.getMyShopInfo.id;
@@ -180,17 +173,13 @@ export default {
 			this.filterProductInfoContrapose = [];
 			this.page = 1;
 			this.isMore = true;
-			},
+		},
 		selectSussess(val) {
-			uni.showLoading({
-				title: "加载中"
-			});
+			uni.showLoading({ title: "加载中" })
 			this.initProductInfo();
 			let type = "";
 			this.shopId = val.selectItem.id;
-
-			this.initData({ type, shopId: this.shopId });
-			
+			this.initData({ type, shopId: this.shopId })
 		}
 	}
 };

ghsApp/src/admin/item/components/ItemStock.vue

@@ -2,7 +2,7 @@
 <view class="product">
 	<view class="item-cmd_bx" :class="[info.status ==2?'sold-out':'']">
 		<view class="img_bx">
-			<app-img :src="info.cover" alt="花材" mode="aspectFit" :height="160" />
+			<image :src="info.cover" style="width:160upx;height:160upx;"></image>
 		</view>
 		<view class="cmd-info_bx active" @click="pageTo({url: '/admin/item/detail',query: {id: info.id}})">
 			<view class="tit">{{ info.itemName || "" }}</view>
@@ -25,11 +25,9 @@
 </template>
 <script>
 import { STOCK_TYPE } from "@/utils/declare";
-import AppImg from "@/components/app-img";
 export default {
 	name: "Commodity",
 	components: {
-		AppImg
 	},
 	props: {
 		isPrice: {

ghsApp/src/admin/item/list.vue

@@ -2,7 +2,7 @@
 	<view class="billing_box_bg">
     <view class="input-wrap">
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输字母找，如小菊 xj" @input="searchFn"/>
+				<app-search-module v-model="py" placeholder="找小菊请输xj" @input="searchFn"/>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" style="margin-right:10upx;" @click="downloadTable()">价格表</button>
@@ -19,7 +19,7 @@
 																	@scroll="scroll_detail"
 																	lower-threshold="100"
 																	@scrolltolower="scroll_bottom">
-				<!--内容部分 start -->
+				<!--内容部分-->
 				<block v-if="!$util.isEmpty(filterProductInfo)">
 					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in filterProductInfo" :key="classIndex" :id="`class_${classIndex}`">
 						<view class="item_list_title" v-if="!$util.isEmpty(classItem.child)"> {{ classItem.className }}</view>
@@ -35,8 +35,6 @@
 						<app-wrapper-empty  title="暂无数据" :is-empty="$util.isEmpty(filterProductInfo)"/>
 					</view>
 				</block>
-				<!--内容部分 end -->
-
 			</scroll-view>
 		</view>
 
@@ -99,7 +97,6 @@ export default {
 				itemList: levelList,
 				success: function (respond) {
 					level = respond.tapIndex
-
 					uni.showLoading({title:'下载中',mask:true})
 					generatePriceTable({level:level}).then(res => {
 						if(res.code == 1){
@@ -129,9 +126,6 @@ export default {
 							});
 						}					
 					})
-
-
-
 				}
 			})
 
@@ -140,18 +134,18 @@ export default {
 			let that = this
 			console.log('admin/ghsProduct/detail?shopId='+ that.loginInfo.shopId+'&id=0&ghsShopAdminId='+that.loginInfo.shopAdminId+'&id='+id)
 			uni.navigateToMiniProgram({
-						//姜枫-2021.04.13
-						appId: that.getAppIdList.hd.miniAppId,
-						path: 'admin/ghsProduct/detail?shopId='+ that.loginInfo.shopId+'&ghsShopAdminId='+that.loginInfo.shopAdminId+'&id='+id,
-						//develop 开发版 trial 体验版 release 正式版
-						envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
-						extraData: {
-							'shopId': that.loginInfo.shopId,
-							'id': 0,
-							'name':'',
-						},
-						success (res) {
-						}
+				//姜枫-2021.04.13
+				appId: that.getAppIdList.hd.miniAppId,
+				path: 'admin/ghsProduct/detail?shopId='+ that.loginInfo.shopId+'&ghsShopAdminId='+that.loginInfo.shopAdminId+'&id='+id,
+				//develop 开发版 trial 体验版 release 正式版
+				envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
+				extraData: {
+					'shopId': that.loginInfo.shopId,
+					'id': 0,
+					'name':'',
+				},
+				success (res) {
+				}
 			})
 		},
 		affirm(val) {
@@ -177,17 +171,13 @@ export default {
 			this.filterProductInfoContrapose = [];
 			this.page = 1;
 			this.isMore = true;
-			},
+		},
 		selectSussess(val) {
-			uni.showLoading({
-				title: "加载中"
-			});
+			uni.showLoading({ title: "加载中" })
 			this.initProductInfo();
 			let type = "";
 			this.shopId = val.selectItem.id;
-
 			this.initData({ type, shopId: this.shopId });
-			
 		}
 	}
 };
@@ -311,4 +301,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="billing_box_bg">
 		<view class="input-wrap">
-			<app-search-module
-				v-model="py"
-				placeholder="输英文字母搜索，如艾莎 as"
-				@input="searchFn"
-			/>
+			<app-search-module v-model="py" placeholder="输字母搜索，如艾莎 as" @input="searchFn" />
 		</view>
 		<view class="scroll-middle_bx">
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
@@ -14,7 +10,6 @@
 				</div>
 				<view style="height: 120upx"></view>
 			</scroll-view>
-
 				<scroll-view scroll-y class="right-box" v-if="tabIndex == 0" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
 																	@scroll="scroll_detail"
 																	lower-threshold="100"
@@ -29,7 +24,6 @@
 							<Commondity v-if="classItem.isActive"
 								:key="productIndex"
 								:info="productItem"
-								:storeItem="getSelectItemById(productItem.id, classItem.classId)"
 								@showAddModel="showAddModel"
 								@add="addEvent"
 								@groupDataBeforeShowModel="groupInfoBeforeShowModel"
@@ -42,7 +36,6 @@
 				<block v-else>
 					<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(filterProductInfo)" />
 				</block>
-
 			</scroll-view>
 			<block v-else>
 				<view style="width:100%">
@@ -50,15 +43,7 @@
 				</view>
 			</block>
 		</view>
-		<modal-module
-			:show="isModel"
-			@cancel="modalCancel"
-			@click="affirm"
-			:title="customData.itemName"
-			color="#333"
-			:size="32"
-			padding="30upx 30upx"
-		>
+		<modal-module :show="isModel" @cancel="modalCancel" @click="stockConfirm" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> 库存{{ customData.stock }} </view>
@@ -69,27 +54,15 @@
 				</view>
 			</template>
 		</modal-module>
-		<modal-module
-			:show="showSubmitModel"
-			@cancel="cancelEvent"
-			@click="submitEvent"
-			:title="confirmContent"
-			color="#333"
-			:size="32"
-			padding="30upx 30upx"
-		>
+		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" :title="confirmContent" color="#333" :size="32" padding="30rpx 30rpx" >
 		</modal-module>
-		<FooterCart
-			:price="allPrice"
-			:count="allCount"
-			@confirm="confirmSelectEvent"
-		></FooterCart>
+
+		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmOut" ></FooterCart>
+
 	</view>
 </template>
-
 <script>
 import AppSearchModule from "@/components/module/app-search";
-import AppTabs from "@/components/plugin/tabs";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import Commondity from "@/components/module/app-commodity";
 import FooterCart from "@/components/module/app-footer-cart";
@@ -99,9 +72,8 @@ import productMins from "@/mixins/product";
 import allMoreSelectInput from "@/components/module/allMoreSelectInput";
 import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
 export default {
-	name: "allotEx", // 开单
+	name: "allotEx",
 	components: {
-		AppTabs,
 		AppSearchModule,
 		AppWrapperEmpty,
 		Commondity,
@@ -114,22 +86,11 @@ export default {
 			COMMODITY_TYPE,
 			pageType: "allotEx",
 			tabIndex: 0,
-			tabs: [
-				{
-					name: "花材"
-				},
-				{
-					name: "成品"
-				}
-			],
 			isFocus: false,
 			isModel: false,
 			checkStock: true,
-			isSmallCount:false,//是否是小单位（支）
-			customData: {
-				bigCount: 0,
-				smallCount: 0
-			},
+			isSmallCount:false,
+			customData: { bigCount: 0, smallCount: 0, userPrice:0 },
 			showSubmitModel: false
 		};
 	},
@@ -156,8 +117,8 @@ export default {
 		modalCancel() {
 			this.isModel = false;
 			this.customData = {};
-		}, // 取消 确认
-		affirm(val) {
+		},
+		stockConfirm(val) {
 			this.isFocus = false;
 			this.isFocusOne = false;
 			this.$nextTick(()=>{
@@ -214,7 +175,7 @@ export default {
 			}
 		},
 		//确认选好了
-		confirmSelectEvent() {
+		confirmOut() {
 			if (this.selectList.length > 0) {
 
 

ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -19,19 +19,12 @@
 
 					<view class="table-view">
 						<view class="table-header" >
-							<view class="table-th" v-for="(item, index) in columns" :key="index"
-								:style="{flex: item.width ? `0 0 ${item.width}upx` : '1',
-									textAlign: item.align || 'left',
-									}">
+							<view class="table-th" v-for="(item, index) in columns" :key="index" :style="{flex: item.width ? `0 0 ${item.width}upx` : '1', textAlign: item.align || 'left', }">
 								{{ item.name || "" }}
 							</view>
 						</view>
 						<view class="table-tr" v-for="(item, index) in selectList" :key="index">
-							<view class="table-td" v-for="(column, columnIndex) in columns" :key="columnIndex"
-								:style="{flex: column.width ? `0 0 ${column.width}upx` : '1',
-									textAlign: column.align || 'left',
-									
-									}">
+							<view class="table-td" v-for="(column, columnIndex) in columns" :key="columnIndex" :style="{flex: column.width ? `0 0 ${column.width}upx` : '1', textAlign: column.align || 'left', }">
 								<view v-if="column.custom == 'icon'" class="list-icon">
 									<image class="icon-image" :src="item.cover" alt="商品图" />
 									<view class="icon-info">
@@ -314,12 +307,6 @@ export default {
 						height: 240upx;
 					}
 				}
-				// .tui-placeholder,
-				// .tui-input {
-				// 	padding-right: 30upx;
-				// 	width: 100%;
-				// 	text-align: right;
-				// }
 			}
 		}
 		.ex-table {