下载价格表

ghs/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.wixhb.com';
+const proxyTarget = 'http://api.shop.hzghd.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -14,11 +14,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else{
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `https://img.hzghd.com/`;
 }
 
 const cdn = {

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

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

ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.js

@@ -1,4 +1,4 @@
-require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/item/components/ItemStock"],{"0093":function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"0273":function(t,n,e){},"22d4a":function(t,n,e){"use strict";e.r(n);var o=e("2614"),u=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=u.a},2614:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("7602"),u=function(){Promise.all([e.e("common/vendor"),e.e("components/app-img")]).then(function(){return resolve(e("cb3c"))}.bind(null,e)).catch(e.oe)},i={name:"Commodity",components:{AppImg:u},props:{type:{type:String,default:o.STOCK_TYPE.WARN},isPrice:{type:Boolean,default:!0},isEdit:{type:Boolean,default:!0},info:{required:!0}},data:function(){return{STOCK_TYPE:o.STOCK_TYPE}},methods:{goToProduct:function(t){this.$emit("goToProduct",t)},customNum:function(){this.$emit("customNum")},addEvent:function(){this.$emit("add")},subtractEvent:function(){this.$emit("subtract")},delEvent:function(){this.$emit("del")}}};n.default=i},43604:function(t,n,e){"use strict";e.r(n);var o=e("0093"),u=e("22d4a");for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);e("f458");var c,r=e("0095"),a=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"b5cd8110",null,!1,o["a"],c);n["default"]=a.exports},f458:function(t,n,e){"use strict";var o=e("0273"),u=e.n(o);u.a}}]);
+require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/item/components/ItemStock"],{"22d4a":function(t,n,e){"use strict";e.r(n);var o=e("2614"),i=e.n(o);for(var u in o)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(u);n["default"]=i.a},2614:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("7602"),i=function(){Promise.all([e.e("common/vendor"),e.e("components/app-img")]).then(function(){return resolve(e("cb3c"))}.bind(null,e)).catch(e.oe)},u={name:"Commodity",components:{AppImg:i},props:{type:{type:String,default:o.STOCK_TYPE.WARN},isPrice:{type:Boolean,default:!0},isEdit:{type:Boolean,default:!0},info:{required:!0}},data:function(){return{STOCK_TYPE:o.STOCK_TYPE}},methods:{goToStockDetail:function(t){this.$util.pageTo({url:"/pagesStorehouse/stockWarn/detailed?id="+t})},goToProduct:function(t){this.$emit("goToProduct",t)},customNum:function(){this.$emit("customNum")},addEvent:function(){this.$emit("add")},subtractEvent:function(){this.$emit("subtract")},delEvent:function(){this.$emit("del")}}};n.default=u},43604:function(t,n,e){"use strict";e.r(n);var o=e("9369"),i=e("22d4a");for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);e("4b83");var c,a=e("0095"),r=Object(a["a"])(i["default"],o["b"],o["c"],!1,null,"00b83a0e",null,!1,o["a"],c);n["default"]=r.exports},"4b83":function(t,n,e){"use strict";var o=e("802f"),i=e.n(o);i.a},"802f":function(t,n,e){},9369:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return o}));var i=function(){var t=this,n=t.$createElement;t._self._c},u=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'admin/item/components/ItemStock-create-component',
     {

ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.wxml

@@ -1 +1 @@
-<view class="item-cmd_bx data-v-b5cd8110"><view class="img_bx data-v-b5cd8110"><app-img vue-id="9f99c904-1" src="{{info.cover}}" alt="花材" mode="aspectFit" height="{{160}}" class="data-v-b5cd8110" bind:__l="__l"></app-img></view><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/item/detail'],['query',{id:info.id}]]]]]]]}}" class="cmd-info_bx active data-v-b5cd8110" bindtap="__e"><view class="tit data-v-b5cd8110">{{info.itemName||""}}</view><view class="kc data-v-b5cd8110">{{"￥"+info.price}}</view><view class="num-open_bx data-v-b5cd8110"><view class="open-bx data-v-b5cd8110">库存<text style="margin-left:10rpx;font-size:23rpx;" class="data-v-b5cd8110">{{info.stock}}</text><text data-event-opts="{{[['tap',[['goToProduct',['$0'],['info.id']]]]]}}" class="share data-v-b5cd8110" catchtap="__e">分享</text></view></view></view></view>
+<view class="data-v-00b83a0e"><view class="item-cmd_bx data-v-00b83a0e"><view class="img_bx data-v-00b83a0e"><app-img vue-id="9f99c904-1" src="{{info.cover}}" alt="花材" mode="aspectFit" height="{{160}}" class="data-v-00b83a0e" bind:__l="__l"></app-img></view><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/item/detail'],['query',{id:info.id}]]]]]]]}}" class="cmd-info_bx active data-v-00b83a0e" bindtap="__e"><view class="tit data-v-00b83a0e">{{info.itemName||""}}</view><view class="kc data-v-00b83a0e">{{"￥"+info.price}}</view><view class="num-open_bx data-v-00b83a0e"><view class="open-bx data-v-00b83a0e">库存<text style="margin-left:10rpx;font-size:23rpx;" class="data-v-00b83a0e">{{info.stock}}</text></view></view></view></view><text data-event-opts="{{[['tap',[['goToStockDetail',['$0'],['info.id']]]]]}}" class="bottom-button data-v-00b83a0e" catchtap="__e">库存明细</text><text data-event-opts="{{[['tap',[['goToProduct',['$0'],['info.id']]]]]}}" class="bottom-button data-v-00b83a0e" catchtap="__e">分享</text></view>

ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.wxss

@@ -1 +1 @@
-.item-cmd_bx.data-v-b5cd8110{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-b5cd8110{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-b5cd8110{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-b5cd8110: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-b5cd8110{font-size:30rpx;font-weight:700;color:#333}.item-cmd_bx .cmd-info_bx .kc.data-v-b5cd8110{color:#999;font-size:24rpx;padding:24rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-b5cd8110{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-b5cd8110{font-size:28rpx;color:#999;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-b5cd8110{color:#333;width:280rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-b5cd8110{font-size:24rpx;font-weight:700}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .share.data-v-b5cd8110{position:absolute;right:20rpx;font-weight:400;border:2rpx solid #ccc;font-size:22rpx;border-radius:20rpx;padding:6rpx 22rpx 6rpx 22rpx}
+.bottom-button.data-v-00b83a0e{font-weight:400;border:2rpx solid #ccc;font-size:22rpx;border-radius:20rpx;padding:6rpx 22rpx 6rpx 22rpx;margin:0 26rpx 0 0;float:right;color:#aaa9a9}.item-cmd_bx.data-v-00b83a0e{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-00b83a0e{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-00b83a0e{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-00b83a0e: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-00b83a0e{font-size:30rpx;font-weight:700;color:#333}.item-cmd_bx .cmd-info_bx .kc.data-v-00b83a0e{color:#999;font-size:24rpx;padding:24rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-00b83a0e{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-00b83a0e{font-size:28rpx;color:#999;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-00b83a0e{color:#333;width:280rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-00b83a0e{font-size:24rpx;font-weight:700}

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

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

ghsApp/dist/build/mp-weixin/admin/ptItem/itemList.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "从平台选花材",
+  "navigationBarTitleText": "从平台导入",
   "usingComponents": {
     "app-search-module": "/components/module/app-search",
     "app-wrapper-empty": "/components/app-wrapper-empty",

ghsApp/dist/build/mp-weixin/admin/ptItem/itemList.wxml

@@ -1 +1 @@
-<view class="billing_box_bg data-v-394b8a5d"><view class="input-wrap data-v-394b8a5d"><view class="search-bar data-v-394b8a5d"><app-search-module vue-id="37b4ec1b-1" placeholder="请输入汉字拼音首字母搜索" value="{{py}}" data-event-opts="{{[['^input',[['__set_model',['','py','$event',[]]],['searchFnContrapose']]]]}}" bind:input="__e" class="data-v-394b8a5d" bind:__l="__l"></app-search-module></view><view style="padding:0 0rpx 0 20rpx;" class="data-v-394b8a5d"><button data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/item/detail'],['type',2]]]]]]]}}" class="admin-button-com middle blue data-v-394b8a5d" bindtap="__e">手动添加</button></view></view><view class="scroll-middle_bx data-v-394b8a5d"><block wx:if="{{!$root.g0}}"><block class="data-v-394b8a5d"><scroll-view class="item_list_bx data-v-394b8a5d" style="width:100%;" scroll-y="{{true}}" lower-threshold="100" data-event-opts="{{[['scrolltolower',[['loadMore',['$event']]]]]}}" bindscrolltolower="__e"><block wx:for="{{filterProductInfoContrapose}}" wx:for-item="productItem" wx:for-index="productIndex" wx:key="productIndex"><view style="padding:20rpx 0;" class="data-v-394b8a5d"><pt-item-info vue-id="{{'37b4ec1b-2-'+productIndex}}" isPrice="{{false}}" type="{{STOCK_TYPE.WARN}}" info="{{productItem}}" isEdit="{{true}}" modifyStock="{{modifyStock}}" data-event-opts="{{[['^selectItem',[['selectItem']]]]}}" bind:selectItem="__e" class="data-v-394b8a5d" bind:__l="__l"></pt-item-info></view></block></scroll-view></block></block><block wx:else><block class="data-v-394b8a5d"><view style="width:100%;" class="data-v-394b8a5d"><app-wrapper-empty vue-id="37b4ec1b-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-394b8a5d" bind:__l="__l"></app-wrapper-empty></view></block></block></view></view>
+<view class="billing_box_bg data-v-6a9b8067"><view class="input-wrap data-v-6a9b8067"><view class="search-bar data-v-6a9b8067"><app-search-module vue-id="37b4ec1b-1" placeholder="请输入汉字拼音首字母搜索" value="{{py}}" data-event-opts="{{[['^input',[['__set_model',['','py','$event',[]]],['searchFnContrapose']]]]}}" bind:input="__e" class="data-v-6a9b8067" bind:__l="__l"></app-search-module></view><view style="padding:0 0rpx 0 20rpx;" class="data-v-6a9b8067"><button data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/item/detail'],['type',2]]]]]]]}}" class="admin-button-com middle blue data-v-6a9b8067" bindtap="__e">自己添加</button></view></view><view class="scroll-middle_bx data-v-6a9b8067"><block wx:if="{{!$root.g0}}"><block class="data-v-6a9b8067"><scroll-view class="item_list_bx data-v-6a9b8067" style="width:100%;" scroll-y="{{true}}" lower-threshold="100" data-event-opts="{{[['scrolltolower',[['loadMore',['$event']]]]]}}" bindscrolltolower="__e"><block wx:for="{{filterProductInfoContrapose}}" wx:for-item="productItem" wx:for-index="productIndex" wx:key="productIndex"><view style="padding:20rpx 0;" class="data-v-6a9b8067"><pt-item-info vue-id="{{'37b4ec1b-2-'+productIndex}}" isPrice="{{false}}" type="{{STOCK_TYPE.WARN}}" info="{{productItem}}" isEdit="{{true}}" modifyStock="{{modifyStock}}" data-event-opts="{{[['^selectItem',[['selectItem']]]]}}" bind:selectItem="__e" class="data-v-6a9b8067" bind:__l="__l"></pt-item-info></view></block></scroll-view></block></block><block wx:else><block class="data-v-6a9b8067"><view style="width:100%;" class="data-v-6a9b8067"><app-wrapper-empty vue-id="37b4ec1b-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-6a9b8067" bind:__l="__l"></app-wrapper-empty></view></block></block></view></view>

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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

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

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

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

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

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

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/components/plugin/tabs.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/src/admin/changePrice/list.vue

@@ -5,6 +5,9 @@
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="请输入汉字拼音首字母搜索" @input="searchFn"/>
 			</view>
+			<view style="padding:0 0rpx 0 20rpx;" >
+				<button class="admin-button-com middle blue" @click="downloadTable()">下载价格表</button>
+			</view>
 		</view>
 
 		<view class="scroll-middle_bx">
@@ -61,7 +64,7 @@ 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'
+import { batchChangePrice,generatePriceTable } from '@/api/product/index'
 export default {
 	name: "item_list",
 	components: {
@@ -87,6 +90,39 @@ export default {
 		this.initProduct()
 	},
 	methods: {
+		downloadTable(){
+			uni.showLoading({title:'下载中',mask:true});
+			generatePriceTable().then(res => {
+				if(res.code == 1){
+					uni.hideLoading()
+					let file = res.data.file
+					uni.downloadFile({
+						url: file,
+						success: (res) => {
+							if (res.statusCode === 200) {
+
+								uni.openDocument({
+									filePath: res.tempFilePath,
+									success:()=> {
+										uni.showToast({title: "已打开",duration: 2000})
+									},
+									fail:()=>{
+										uni.hideLoading();
+									},
+									complete: function() {
+										uni.hideLoading();
+									}
+								})
+
+							}
+						},
+						fail:()=>{
+							uni.showToast({title:'请用电脑打开小程序下载',mask:true})
+						}
+					});
+				}					
+			})
+		},
 		initProduct(){
 			this.shopId = this.getMyShopInfo.id;
 			let type = '';

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

@@ -1,4 +1,5 @@
 <template>
+<view>
 	<view class="item-cmd_bx">
 		<view class="img_bx">
 			<app-img :src="info.cover" alt="花材" mode="aspectFit" :height="160" />
@@ -10,13 +11,15 @@
 				<template>
 					<view class="open-bx">
 						库存 <text style="margin-left: 10rpx;font-size: 23rpx">{{ info.stock }}</text>
-						<text class="share" @click.stop="goToProduct(info.id)">分享</text>
 					</view>
 				</template>
 			</view>
 		</view>
 
 	</view>
+	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存明细</text>
+	<text class="bottom-button" @click.stop="goToProduct(info.id)">分享</text>
+</view>
 </template>
 <script>
 import { STOCK_TYPE } from "@/utils/declare";
@@ -49,6 +52,9 @@ export default {
 		};
 	},
 	methods: {
+		goToStockDetail(id){
+			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
+		},
 		goToProduct(id) {
 			this.$emit('goToProduct', id)
 		},
@@ -69,6 +75,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.bottom-button{
+	font-weight:normal;
+	border:2rpx solid #cccccc;
+	font-size:22rpx;
+	border-radius: 20rpx;
+	padding:6rpx 22rpx 6rpx 22rpx;
+	margin:0 26rpx 0 0;
+	float:right;
+	color:#aaa9a9;
+}
 .item-cmd_bx {
 	position: relative;
 	margin-bottom: 20px;
@@ -127,15 +143,6 @@ export default {
 				*.warn {
 					color: $redColor;
 				}
-				.share{
-					position: absolute;
-					right:20rpx;
-					font-weight:normal;
-					border:2rpx solid #cccccc;
-					font-size:22rpx;
-					border-radius: 20rpx;
-					padding:6rpx 22rpx 6rpx 22rpx;
-				}
 			}
 		}
 	}

ghsApp/src/admin/item/detail.vue

@@ -61,7 +61,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">库存</div>
           <input v-model="form.stock" style="width:340rpx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-          <button v-if="productData.id" class="admin-button-com blue small" @click="goStockDetail(productData.id)">查看明细</button>
+          <button v-if="productData.id" class="admin-button-com blue small" @click="goStockDetail(productData.id)">变动明细</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">

ghsApp/src/admin/item/list.vue

@@ -25,7 +25,7 @@
 						<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">
+							<view style="height: 240rpx" :id="`class_${classIndex}`" :key="productIndex">
 								<ItemStock v-if="classItem.isActive"
 								:isPrice="false"
 								:type="tabs[tabIndex].key"

ghsApp/src/admin/ptItem/itemList.vue

@@ -5,7 +5,7 @@
 				<app-search-module v-model="py" placeholder="请输入汉字拼音首字母搜索" @input="searchFnContrapose"/>
 			</view>
 			<view style="padding:0 0rpx 0 20rpx;" >
-				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/detail',type:2 })">手动添加</button>
+				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/detail',type:2 })">自己添加</button>
 			</view>
 		</view>
 		<view class="scroll-middle_bx">

ghsApp/src/api/product/index.js

@@ -57,4 +57,9 @@ export const getProductDetail = data => {
 //获取拼音首字母缩写 shish 20210707
 export const py = data => {
 	return https.get("/product/py", data);
+};
+
+//生成价格表 shish 20210922
+export const generatePriceTable = data => {
+	return https.get("/product/generate-price-table", data);
 };

ghsApp/src/pages.json

@@ -17,7 +17,7 @@
 		{
 			"root": "admin/ptItem",
 			"pages": [
-				{"path": "itemList","style": {"navigationBarTitleText": "从平台选花材"}}
+				{"path": "itemList","style": {"navigationBarTitleText": "从平台导入"}}
 			]
 		},
 		{

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -26,17 +26,13 @@
 						<t-tr v-for="(item, index) in list.data" :key="index">
 							<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color">
 								<view v-if="column.custom == 'change'">
-									{{ `${item.bigNumOrder}/${item.smallNumOrder}` }}
+									{{ `${parseFloat(item.itemNum)}` }}
 								</view>
 								<view v-else-if="column.custom == 'stock'">
-									{{ `${item.bigNumStock}/${item.smallNumStock}` }}
+									{{ `${parseFloat(item.newStock)}` }}
 								</view>
 								<view v-else-if="column.custom == 'time'">
-									<view class="icon-info">
-										<view class="info-name">
-											{{ item.addTime }}
-										</view>
-									</view>
+									<view class="icon-info"><view class="info-name">{{ item.addTime }}</view></view>
 								</view>
 								<view v-else>
 									{{ item[column.dataIndex] || "" }}
@@ -124,6 +120,11 @@ export default {
 					dataIndex: "typeName",
 					color: "info"
 				},
+				{
+					name: "姓名",
+					dataIndex: "relateName",
+					color: "info"
+				},
 				{
 					name: "变动",
 					custom: "change",

hd/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.huahb.cn';
+const proxyTarget = 'http://api.shop.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -11,11 +11,11 @@ function resolve(dir) {
 
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `http://img.huaml.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `http://img.huaml.com/`;
 }else{
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `https://img.huaml.com/`;
 }
 const cdn = {
 	dev: {