下单优化

ghsApp/dist/build/mp-weixin/admin/billing/priceChange.json

@@ -1,10 +0,0 @@
-{
-  "navigationBarTitleText": "改价",
-  "enablePullDownRefresh": true,
-  "usingComponents": {
-    "app-tabs": "/components/plugin/tabs",
-    "app-search-module": "/components/module/app-search",
-    "app-wrapper-empty": "/components/app-wrapper-empty",
-    "commondity": "/components/module/app-commodity"
-  }
-}

ghsApp/dist/build/mp-weixin/admin/billing/priceChange.wxml

@@ -1 +0,0 @@
-<view class="billing_box_bg data-v-7a247f8e"><view class="input-wrap data-v-7a247f8e"><app-search-module vue-id="2b6abfff-1" placeholder="请输入关键词，支持拼音首字母搜索" value="{{py}}" data-event-opts="{{[['^input',[['__set_model',['','py','$event',[]]],['searchFnContrapose']]]]}}" bind:input="__e" class="data-v-7a247f8e" bind:__l="__l"></app-search-module></view><view class="scroll-middle_bx data-v-7a247f8e"><block wx:if="{{!$root.g0}}"><block class="data-v-7a247f8e"><view style="width:100%;padding:30rpx;" class="data-v-7a247f8e"><block wx:for="{{filterProductInfoContrapose}}" wx:for-item="productItem" wx:for-index="productIndex" wx:key="productIndex"><commondity vue-id="{{'2b6abfff-2-'+productIndex}}" type="{{COMMODITY_TYPE.CHANGE}}" info="{{productItem}}" autoPrice="{{productItem.priceLabel=='2'?productItem.price:null}}" class="data-v-7a247f8e" bind:__l="__l"></commondity></block></view></block></block><block wx:else><block class="data-v-7a247f8e"><view style="width:100%;" class="data-v-7a247f8e"><app-wrapper-empty vue-id="2b6abfff-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-7a247f8e" bind:__l="__l"></app-wrapper-empty></view></block></block></view></view>

ghsApp/dist/build/mp-weixin/admin/changePrice/components/Item.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/changePrice/components/Item"],{"05e1":function(e,n,t){"use strict";var i=t("19ed"),o=t.n(i);o.a},"06f4":function(e,n,t){"use strict";t.r(n);var i=t("f8ee"),o=t.n(i);for(var r in i)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(r);n["default"]=o.a},"19ed":function(e,n,t){},"9edd":function(e,n,t){"use strict";t.r(n);var i=t("db67"),o=t("06f4");for(var r in o)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(r);t("05e1");var c,u=t("0095"),f=Object(u["a"])(o["default"],i["b"],i["c"],!1,null,"2462cac7",null,!1,i["a"],c);n["default"]=f.exports},db67:function(e,n,t){"use strict";var i;t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return i}));var o=function(){var e=this,n=e.$createElement;e._self._c},r=[]},f8ee:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=t("7602"),o=function(){Promise.all([t.e("common/vendor"),t.e("components/app-img")]).then(function(){return resolve(t("cb3c"))}.bind(null,t)).catch(t.oe)},r={name:"Commodity",components:{AppImg:o},props:{type:{type:String,default:i.STOCK_TYPE.WARN},isPrice:{type:Boolean,default:!0},isEdit:{type:Boolean,default:!0},info:{required:!0}},data:function(){return{STOCK_TYPE:i.STOCK_TYPE,modifyPrice:""}},mounted:function(){2==this.info.priceLabel&&(this.modifyPrice=this.info.price)},methods:{savePrice:function(){this.$emit("savePrice",this.modifyPrice,this.info.id)}}};n.default=r}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'admin/changePrice/components/Item-create-component',
+    {
+        'admin/changePrice/components/Item-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('f3be')['createComponent'](__webpack_require__("9edd"))
+        })
+    },
+    [['admin/changePrice/components/Item-create-component']]
+]);

ghsApp/dist/build/mp-weixin/admin/changePrice/components/Item.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "app-img": "/components/app-img"
+  }
+}

ghsApp/dist/build/mp-weixin/admin/changePrice/components/Item.wxml

@@ -0,0 +1 @@
+<view class="item-cmd_bx data-v-2462cac7"><view class="img_bx data-v-2462cac7"><app-img vue-id="db08d524-1" src="{{info.cover}}" alt mode="aspectFit" height="{{160}}" class="data-v-2462cac7" bind:__l="__l"></app-img></view><view class="cmd-info_bx data-v-2462cac7"><view class="tit data-v-2462cac7">{{info.itemName||""}}</view><view class="num-open_bx data-v-2462cac7"><view class="price red data-v-2462cac7">{{"￥"+info.price}}</view><view style="text-align:right;" class="data-v-2462cac7"><view class="open-bx data-v-2462cac7"><input class="change-input data-v-2462cac7" type="digit" placeholder="自动调价" data-event-opts="{{[['blur',[['savePrice',['$event']]]],['input',[['__set_model',['','modifyPrice','$event',[]]]]]]}}" value="{{modifyPrice}}" bindblur="__e" bindinput="__e"/></view></view></view></view></view>

ghsApp/dist/build/mp-weixin/admin/changePrice/components/Item.wxss

@@ -0,0 +1 @@
+.item-cmd_bx.data-v-2462cac7{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-2462cac7{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-2462cac7{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-2462cac7:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#b2b2b2;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-12rpx;right:30rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-2462cac7{font-size:30rpx;font-weight:700;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-2462cac7{color:#999;font-size:24rpx;padding:10rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-2462cac7{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-2462cac7{font-size:30rpx;color:red;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-2462cac7{color:#333}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-2462cac7{font-size:24rpx;font-weight:700}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .change-input.data-v-2462cac7{width:160rpx;height:60rpx;line-height:60rpx;text-align:center;background:#fff;border:1rpx solid #ddd;border-radius:4rpx;font-size:25rpx;margin-right:50rpx}

ghsApp/dist/build/mp-weixin/admin/changePrice/list.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "批量改价",
+  "usingComponents": {
+    "app-search-module": "/components/module/app-search",
+    "app-wrapper-empty": "/components/app-wrapper-empty",
+    "item-component": "/admin/changePrice/components/Item",
+    "dorpdown-select": "/components/module/dorpdownSelect"
+  }
+}

ghsApp/dist/build/mp-weixin/admin/home/apply.wxml

@@ -1 +1 @@
-<view class="app-content data-v-3ecdcae6"><view class="apply-content_box data-v-3ecdcae6"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-3ecdcae6"><view class="tit data-v-3ecdcae6">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-3ecdcae6"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-3ecdcae6"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-3ecdcae6"><view class="tabs-img _div data-v-3ecdcae6"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-3ecdcae6"></image></view><view class="tabs-name _div data-v-3ecdcae6">{{s.name}}</view></view></view></block></view></view></block></view></view>
+<view class="app-content data-v-0245b0a0"><view class="apply-content_box data-v-0245b0a0"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-0245b0a0"><view class="tit data-v-0245b0a0">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-0245b0a0"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-0245b0a0"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-0245b0a0"><view class="tabs-img _div data-v-0245b0a0"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-0245b0a0"></image></view><view class="tabs-name _div data-v-0245b0a0">{{s.name}}</view></view></view></block></view></view></block></view></view>

ghsApp/dist/build/mp-weixin/admin/home/apply.wxss

@@ -1 +1 @@
-.apply-content_box.data-v-3ecdcae6{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-3ecdcae6{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-3ecdcae6{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-3ecdcae6{padding:40rpx 0rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.apply-content_box .tabs-wrap .tabs-list.data-v-3ecdcae6{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-3ecdcae6{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-3ecdcae6{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-3ecdcae6{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-3ecdcae6:nth-child(-n + 4){margin-top:0}
+.apply-content_box.data-v-0245b0a0{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-0245b0a0{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-0245b0a0{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-0245b0a0{padding:40rpx 0rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.apply-content_box .tabs-wrap .tabs-list.data-v-0245b0a0{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-0245b0a0{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-0245b0a0{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-0245b0a0{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-0245b0a0:nth-child(-n + 4){margin-top:0}

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/admin/item/detail.wxss

@@ -1 +1 @@
-.app-content.data-v-f0aefb2c{min-height:calc(100vh - 100rpx);padding-bottom:150rpx}.module-com.data-v-f0aefb2c{margin-bottom:20rpx;background-color:#fff;color:#666}.module-com .module-tit.data-v-f0aefb2c{padding:20rpx 30rpx;font-size:28rpx}.module-com .module-det.data-v-f0aefb2c{padding:0 30rpx}.category-wrap.data-v-f0aefb2c{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;padding-bottom:0!important}.category-wrap .tui-input.data-v-f0aefb2c{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.category-wrap .tui-input .admin-button-com.data-v-f0aefb2c{margin-right:20rpx;margin-bottom:20rpx;position:relative;z-index:9999}.summary-wrap .goods-summary.data-v-f0aefb2c{height:400rpx}.app-footer.data-v-f0aefb2c{-webkit-box-pack:space-evenly;-webkit-justify-content:space-evenly;justify-content:space-evenly;z-index:9999}.app-footer .admin-button-com.data-v-f0aefb2c{width:46%}
+.app-content.data-v-5a12c906{min-height:calc(100vh - 100rpx);padding-bottom:150rpx}.module-com.data-v-5a12c906{margin-bottom:20rpx;background-color:#fff;color:#666}.module-com .module-tit.data-v-5a12c906{padding:20rpx 30rpx;font-size:28rpx}.module-com .module-det.data-v-5a12c906{padding:0 30rpx}.category-wrap.data-v-5a12c906{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;padding-bottom:0!important}.category-wrap .tui-input.data-v-5a12c906{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.category-wrap .tui-input .admin-button-com.data-v-5a12c906{margin-right:20rpx;margin-bottom:20rpx;position:relative;z-index:9999}.summary-wrap .goods-summary.data-v-5a12c906{height:400rpx}.app-footer.data-v-5a12c906{-webkit-box-pack:space-evenly;-webkit-justify-content:space-evenly;justify-content:space-evenly;z-index:9999}.app-footer .admin-button-com.data-v-5a12c906{width:46%}

ghsApp/dist/build/mp-weixin/app.json

@@ -62,6 +62,12 @@
         "me/rechargeSuccess"
       ]
     },
+    {
+      "root": "admin/changePrice",
+      "pages": [
+        "list"
+      ]
+    },
     {
       "root": "admin/ghs",
       "pages": [
@@ -163,7 +169,6 @@
       "pages": [
         "index",
         "customerPlace",
-        "priceChange",
         "result",
         "affirm",
         "customerAffirm",

ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/app-result.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/fab.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/src/admin/billing/index.vue

@@ -53,14 +53,14 @@
 		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :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.price }} 库存：{{ customData.stock }} </view>
+					<view class="kc"><text class="unit_price">库存 {{ customData.stock }}</text><text class="unit_price"> 单价 {{ customData.price }}</text>1扎={{customData.ratio}}支</view>
 					<view class="num_bx">
 						<input v-model="customData.bigCount" @input="countPrice" :focus="isFocus" type="number" />扎
 						<input v-model="customData.smallCount" @input="countPrice" type="number" style="margin-left:24upx" />支
 					</view>
 					<view class="num_bx">
-						<input style="width: 498rpx" v-model="customData.userPrice" @focus="customData.userPrice = null" type="number" placeholder="金额" />
-						<text style="margin-left: 10rpx">元</text>
+						<input style="width: 495rpx" v-model="customData.userPrice" @focus="customData.userPrice = null" type="number" placeholder="金额" />
+						<text>元</text>
 					</view>
 				</view>
 			</template>
@@ -142,9 +142,9 @@ 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.userPrice = 	this.customData.userPrice==0?null:this.customData.userPrice;
+				this.customData.smallCount =	this.customData.smallCount==0?null:this.customData.smallCount;
+				this.customData.bigCount =	this.customData.bigCount==0?null:this.customData.bigCount;
+				this.customData.userPrice =	this.customData.userPrice==0?null:this.customData.userPrice;
 				this.isFocus = true;
 			})
 		},
@@ -347,9 +347,12 @@ export default {
 			color: #999999;
 			font-size: 28px;
 			font-weight: 400;
-			margin-bottom: 60px;
+			margin-bottom: 40px;
 			text-align: center;
-			margin-top: 10px;
+			margin-top: 30px;
+			.unit_price{
+				padding-right:25rpx;
+			}
 		}
 		& .num_bx {
 			display: flex;

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

@@ -0,0 +1,138 @@
+<template>
+	<view class="item-cmd_bx">
+		<view class="img_bx">
+			<app-img :src="info.cover" alt="" mode="aspectFit" :height="160" />
+		</view>
+		<view class="cmd-info_bx">
+			<view class="tit">{{ info.itemName || "" }}</view>
+			<view class="num-open_bx">
+				<view class="price red">￥{{ info.price }}</view>
+				<view style="text-align: right" >
+					<view class="open-bx" >
+						<input class="change-input" @blur="savePrice" v-model="modifyPrice" type="digit" placeholder="自动调价" />
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { STOCK_TYPE } from "@/utils/declare";
+import AppImg from "@/components/app-img";
+export default {
+	name: "Commodity",
+	components: {
+		AppImg
+	},
+	props: {
+		type: {
+			type: String,
+			default: STOCK_TYPE.WARN
+		},
+		isPrice: {
+			type: Boolean,
+			default: true
+		},
+		isEdit: {
+			type: Boolean,
+			default: true
+		},
+		info: {
+			required: true
+		}
+	},
+	data() {
+		return {
+			STOCK_TYPE,
+			modifyPrice:''
+		};
+	},
+	mounted(){
+		if(this.info.priceLabel == 2){
+			this.modifyPrice = this.info.price
+		}
+	},
+	methods: {
+		savePrice() {
+			this.$emit("savePrice",this.modifyPrice,this.info.id);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.item-cmd_bx {
+	position: relative;
+	margin-bottom: 20px;
+	.img_bx {
+		height: 160px;
+		width: 160px;
+		position: absolute;
+		left: 0px;
+		top: 0px;
+	}
+	.cmd-info_bx {
+		position: relative;
+		padding-left: 177px;
+		&.active{
+			&:before{
+				content: ' ';
+				height: 22rpx;
+				width: 22rpx;
+				border-width: 2rpx 2rpx 0 0;
+				border-color: #b2b2b2;
+				border-style: solid;
+				-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				position: absolute;
+				top: 50%;
+				margin-top: -12rpx;
+				right: 30rpx;
+			}
+		}
+
+		& .tit {
+			font-size: 30px;
+			font-weight: bold;
+			color: #333333;
+			padding-top: 10px;
+		}
+		& .kc {
+			color: #999999;
+			font-size: 24px;
+			padding: 10px 0 24px;
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			& .price {
+				font-size: 30px;
+				color: red;
+				flex: 1;
+			}
+			& .open-bx {
+				color: #333333;
+				text{
+					font-size: 24rpx;
+					font-weight: 700;
+				}
+				*.warn {
+					color: $redColor;
+				}
+				.change-input {
+					width: 160px;
+					height: 60px;
+					line-height: 60px;
+					text-align: center;
+					background: #ffffff;
+					border: 1px solid #dddddd;
+					border-radius: 4px;
+					font-size: 25px;
+					margin-right:50rpx;
+				}
+			}
+		}
+	}
+}
+</style>

ghsApp/src/admin/changePrice/list.vue

@@ -0,0 +1,289 @@
+<template>
+	<view class="billing_box_bg">
+    <app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
+    <view class="input-wrap">
+			<view class="search-bar">
+				<app-search-module v-model="py" placeholder="输入拼音首字母查询" @input="searchFn"/>
+			</view>
+		</view>
+
+		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+				<div v-for="(item, index) in filterProductInfo" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+			</scroll-view>
+				<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
+																	@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>
+						<text v-if="tabs[tabIndex].name=='库存预警'&&$util.isEmpty(classItem.child)">当前库存充足</text>
+						<template v-for="(productItem, productIndex) in classItem.child">
+							<view style="height: 200rpx" :id="`class_${classIndex}`" :key="productIndex">
+								<ItemComponent v-if="classItem.isActive"
+								:isPrice="false"
+								:type="tabs[tabIndex].key"
+								:info="productItem"
+								@savePrice="savePrice"
+							></ItemComponent>
+							</view>
+						</template>
+					</view>
+				</block>
+				<block v-else>
+					<view style="width: 100%">
+						<app-wrapper-empty  title="暂无数据" :is-empty="$util.isEmpty(filterProductInfo)"/>
+					</view>
+				</block>
+				<!--内容部分 end -->
+
+			</scroll-view>
+		</view>
+
+      <div class="app-footer">
+        <button class="admin-button-com big blue" @click="commitPrice">保存修改</button>
+      </div>
+
+	</view>
+</template>
+
+<script>
+import AppSearchModule from "@/components/module/app-search";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import ItemComponent from "./components/Item";
+import { STOCK_TYPE } from "@/utils/declare";
+import productMins from "@/mixins/product";
+import productContraposeMins from "@/mixins/productContrapose";
+import { selectShop } from "@/mixins";
+import { mapGetters } from "vuex";
+import DorpdownSelect from "@/components/module/dorpdownSelect";
+import { batchChangePrice } from '@/api/product/index'
+export default {
+	name: "item_list",
+	components: {
+		AppSearchModule,
+		AppWrapperEmpty,
+		ItemComponent,
+		DorpdownSelect
+	},
+	mixins: [productMins, selectShop,productContraposeMins],
+	data() {
+		return {
+			STOCK_TYPE,
+			autoLoad: false, //不自动请求数据  自定义请求
+			pageType: "stock",
+			tabIndex: 0,
+			priceArr:[]
+		};
+	},
+	computed:{
+		...mapGetters(["getMyShopInfo","getLoginInfo"]),
+	},
+	onLoad() {
+		this.initProduct()
+	},
+	methods: {
+		initProduct(){
+			this.shopId = this.getMyShopInfo.id;
+			let type = '';
+			this.initData({ type, shopId: this.shopId,status:0});
+		},
+		commitPrice(){
+			if(this.priceArr.length == 0){
+				uni.showToast({title:"没有修改",icon:"none"})
+				return;
+			}
+			let data = JSON.stringify(this.priceArr);
+			batchChangePrice({data}).then(res => {
+					if(res.code == 1){
+						this.priceArr = [];
+						this.initProduct()
+					}
+					this.$msg(res.msg)					
+				})
+		},
+		savePrice(price,id){
+			console.log('price',price,id)
+
+			if(this.priceArr.length > 0){
+				this.priceArr.forEach(function(value,index,array){
+					if(value.id == id){
+						array.splice(index,1)
+					}
+				});
+			}
+			this.priceArr.push({id:id,price:price});
+			console.log(this.priceArr,'price')
+		},
+		affirm(val) {
+			if (val.index === 0) {
+				this.modalCancel();
+			}
+		},
+		change(e) {
+			if (this.tabIndex == e.index) {
+				return false;
+			} else {
+				uni.showLoading({
+					title: "加载中"
+				});
+				this.tabIndex = e.index;
+				this.tabs[this.tabIndex].key;
+				let type = "";
+				this.initData({ type, shopId: this.shopId });
+			}
+		},
+		scrollTop() {},
+		initProductInfo() {
+			this.filterProductInfoContrapose = [];
+			this.page = 1;
+			this.isMore = true;
+			},
+		selectSussess(val) {
+			uni.showLoading({
+				title: "加载中"
+			});
+			this.initProductInfo();
+			let type = "";
+			this.shopId = val.selectItem.id;
+
+			this.initData({ type, shopId: this.shopId });
+			
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.billing_box_bg {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	.input-wrap {
+		display: flex;
+		padding: 22px 20px 22px 30px;
+		.search-bar {
+			flex: 1;
+		}
+		.city-select {
+			display: flex;
+			flex-shrink: 0;
+			align-items: center;
+			margin-right: 15upx;
+			margin-left: 45px;
+			background-color: #ffff;
+			.iconfont {
+				margin-left: 20upx;
+				font-size: 30upx;
+			}
+		}
+	}
+	.scroll-middle_bx {
+		flex: 1;
+		display: flex;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+	.tab-view {
+		height: 100%;
+		width: 170upx;
+		flex-shrink: 0;
+		background-color: #f0f2f6;
+		.tab-bar-item {
+			position: relative;
+			width: 170upx;
+			height: 90upx;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 26upx;
+			color: #444;
+			font-weight: 400;
+			.tag {
+				display: flex;
+				padding: 0 20px;
+				align-items: center;
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 32px;
+				background: #ff2842;
+				border-radius: 16px;
+				color: #fff;
+				font-size: 20px;
+			}
+      &:last-child{
+        margin-bottom: 110upx;
+      }
+		}
+
+		.active {
+			position: relative;
+			color: $mainColor;
+			font-size: 26px;
+			background: #fff;
+		}
+
+		.active::before {
+			content: "";
+			position: absolute;
+			border-left: 8upx solid $mainColor;
+			height: 100%;
+			left: 0;
+		}
+	}
+	.right-box {
+		height: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+	.item_list_bx {
+		padding: 40px 16px;
+	}
+	.item_list_title {
+		margin-bottom: 20px;
+		font-size: 24px;
+		font-weight: 600;
+		color: #666666;
+	}
+	.select-cmd_bx {
+		& .kc {
+			color: #999999;
+			font-size: 28px;
+			font-weight: 400;
+			margin-bottom: 60px;
+			text-align: center;
+			margin-top: 10px;
+		}
+		& .num_bx {
+			display: flex;
+			align-items: center;
+			margin-bottom: 80px;
+			& > input {
+				width: 212px;
+				height: 80px;
+				border: 1px solid #dddddd;
+				border-radius: 4px;
+				text-align: center;
+				margin-right: 24px;
+			}
+		}
+	}
+	.app-footer {
+		justify-content: space-evenly;
+		z-index: 9999;
+		.admin-button-com {
+			width: 46%;
+		}
+		button{
+			width:600rpx;
+		}
+	}
+}
+</style>

ghsApp/src/admin/home/apply.vue

@@ -115,15 +115,6 @@
                             url: "/pagesStatistics/business"
                         }
                         ]
-                    },{
-                        title:'资金管理',
-                        list:[
-                             {
-                            name: "客户欠款",
-                            img: `${this.$constant.imgUrl}/ghs/home/khqk.png`,
-                            url: "/pagesArrears/list"
-                            }
-                        ]
                     }
                 ]
             }

ghsApp/src/admin/home/workbench.vue

@@ -223,26 +223,6 @@ export default {
 					name: "调拨入库",
 					img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,
 					url: "/pagesStorehouse/allot/allotPut"
-				},
-				{
-					name: "报损单",
-					img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,
-					url: "/admin/breakage/list"
-				},
-				{
-					name: "花材",
-					img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
-					url: "/admin/item/list"
-				},
-				{
-					name: "员工",
-					img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
-					url: "/admin/staff/list"
-				},
-				{
-					name: "经营概况",
-					img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,
-					url: "/pagesStatistics/business"
 				}
 			],
 			// 总览

ghsApp/src/admin/item/detail.vue

@@ -47,7 +47,7 @@
           </tui-list-cell>
 							<tui-list-cell class="line-cell" :hover="false">
 								<div class="tui-title">库存</div>
-								<input v-model="form.stock" placeholder-class="phcolor" class="tui-input" name="stock" placeholder="请输入" maxlength="50" type="number"/>
+								<input v-model="form.stock" placeholder-class="phcolor" class="tui-input" name="stock" placeholder="请输入" maxlength="50" type="digit"/>
 							</tui-list-cell>
         <tui-list-cell class="line-cell" :arrow="true">
           <div class="tui-title">大单位</div>

ghsApp/src/mixins/product.js

@@ -63,7 +63,6 @@ export default {
 		},
 		allPrice() {
 			let price = 0;
-			console.log('this.selectList总价',this.selectList)
 			if (this.selectList) {
 				for (const item of this.selectList) {
 					const itemInfo = this.getSelectItemById(item.id, item.classId);
@@ -73,12 +72,11 @@ export default {
 						!this.$util.isEmpty(itemInfo.smallPrice)
 					) {
 						if(item.userPrice>0){
-							price += item.userPrice;
+							price += Number(item.userPrice);
 						}else{
 							price += item.bigCount * Number(itemInfo.bigPrice);
 							price += item.smallCount * Number(itemInfo.smallPrice);
 						}
-
 					}
 				}
 			}
@@ -171,22 +169,7 @@ export default {
 			}
 			this.filterProductInfo = classList
 		},
-		/**
-		 * 通过id获取当前选中的该商品信息
-		 */
-		// getSelectItemInfoById(id, classId) {
-		// 	let info = null;
-		// 	const item =
-		// 		this.productInfo &&
-		// 		this.productInfo.forEach(element => {
-		// 			if (element.classId == classId && element.child) {
-		// 				info = element.child.find(ele => {
-		// 					return ele.id == id;
-		// 				});
-		// 			}
-		// 		});
-		// 	return info;
-		// },
+
 		/**
 		 * 获取当前选中商品总价
 		 */
@@ -254,10 +237,10 @@ export default {
 		},
 
 		/**
-		 * 添加商品
+		 * 添加花材
 		 */
 		addEvent(item) {
-			console.log(item,'****')
+			console.log('新增花材',item)
 			const list = this.selectList;
 			let has = false;
 			for (let index = 0; index < list.length; index++) {
@@ -270,7 +253,6 @@ export default {
 						}else{
 							list[index] = { ...element, bigCount: ++element.bigCount };
 						}
-
 					}else{
 						if (this.isLimit) {
 							if (element.bigCount < item.bigNum) {
@@ -283,16 +265,12 @@ export default {
 								this.$msg("库存不足");
 								return;
 							}
-							//  else if (element.smallCount < item.smallNum) {
-							// 	list[index] = { ...element, smallCount: ++element.smallCount };
-							// }
 						} else {
 							if(this.isSmallCount){
 								list[index] = { ...element, smallCount: ++element.smallCount };
 							}else{
 								list[index] = { ...element, bigCount: ++element.bigCount };
 							}
-							// list[index] = { ...element, bigCount: ++element.bigCount };
 						}
 						if (this.isLimit) {
 							const { bigCount, smallCount } = list[index];
@@ -308,14 +286,11 @@ export default {
 							}
 						}
 					}
-
-
 					break;
 				}
 			}
 			if (!has) {
 				let info = { classId: item.classId, id: item.id };
-
 				const classInfo =
 					this.productInfo &&
 					this.productInfo.find(element => {
@@ -326,7 +301,6 @@ export default {
 						return ele.id == item.id;
 					});
 				}
-
 				let params = {
 					...info,
 					bigCount: this.isSmallCount?0:1, //扎数
@@ -344,9 +318,19 @@ export default {
 					}
 				}
 			}
+			//点加号时增加花材补充userPrice字段 shish 20210728
+			list.forEach(function(product,index,array){
+				console.log(product.id,item.id,'id')
+				if(product.id == item.id){
+					let ratio = product.ratio <= 0 ? 1 : product.ratio
+					let smallUnitPrice = (product.price / ratio).toFixed(2)
+					array[index].userPrice = ((product.bigCount*ratio + product.smallCount)*smallUnitPrice).toFixed(2)
+				}
+			});
+
+			console.log('花材列表',list)
 
 			this.setSelectInfoByType({ type: this.pageType, info: list });
-			// this.$forceUpdate();
 		},
 
 		addCustomNumEvent(item,params1,type) {
@@ -374,12 +358,10 @@ export default {
 					userPrice: null, //调价价格
 				};
 				list.push(params);
-				console.log(list,'-----------')
 				if(type!='noAdd'){
 					this.setSelectInfoByType({ type: this.pageType, info: list });
 				}
 				this.$nextTick(()=>{
-					console.log(9999)
 					this.customNum(params1)
 				})
 		},
@@ -387,6 +369,7 @@ export default {
 		 * 减去商品
 		 */
 		delEvent(item) {
+			console.log('减少花材',item)
 			const list = copyObject(this.selectList);
 			let has = false;
 			for (let index = 0; index < list.length; index++) {
@@ -399,13 +382,22 @@ export default {
 					if (element.smallCount > 0) {
 						if(this.isSmallCount){list[index] = { ...element, smallCount: --element.smallCount };}
 					}
-						if (element.bigCount == 0 && element.smallCount == 0) {
-							list.splice(index, 1);
-						}
+					if (element.bigCount == 0 && element.smallCount == 0) {
+						list.splice(index, 1);
 					}
 				}
+			}
+			//点减号时减少花材补充userPrice字段 shish 20210728
+			list.forEach(function(product,index,array){
+				console.log(product.id,item.id,'id')
+				if(product.id == item.id){
+					let ratio = product.ratio <= 0 ? 1 : product.ratio
+					let smallUnitPrice = (product.price / ratio).toFixed(2)
+					array[index].userPrice = ((product.bigCount*ratio + product.smallCount)*smallUnitPrice).toFixed(2)
+				}
+			});
+			console.log('花材列表',list)
 			this.setSelectInfoByType({ type: this.pageType, info: list });
-			// this.$forceUpdate();
 		},
 		//减去所有商品
 		delAllEvent(item) {
@@ -428,21 +420,6 @@ export default {
 			}
 			console.log('this.selectList','减少花材之后：',this.selectList)
 		},
-		// /**
-		//  * 删除商品
-		//  */
-		// removeEvent(item) {
-		// 	const list = this.selectList;
-		// 	for (let index = list.length - 1; index >= 0; index--) {
-		// 		const element = list[index];
-		// 		if (element.id == item.id && element.classId == item.classId) {
-		// 			list.splice(index, 1);
-		// 			break;
-		// 		}
-		// 	}
-		// 	this.setSelectInfoByType({ type: this.pageType, info: list });
-		// 	// this.$forceUpdate();
-		// },
 		/**
 		 * 更新商品
 		 */
@@ -485,7 +462,6 @@ export default {
 			if(this.isReserve){
 				uni.setStorageSync('selectList', this.selectList);
 			}
-			// this.$forceUpdate();
 		},
 		/**
 		 * 切换左侧商品类别
@@ -568,7 +544,6 @@ export default {
 					// this.scrollPushList();
 					break;
 				}
-				// console.log(this.classIndex,'this.classIndex----')
 			}
 		},
 		scroll_bottom(){