shish пре 5 година
родитељ
комит
d5ce746b89
26 измењених фајлова са 56 додато и 43 уклоњено
  1. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  2. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  3. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  4. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/detail.js
  5. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/detail.wxml
  6. 1 1
      ghsApp/dist/build/mp-weixin/admin/item/detail.wxss
  7. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/list.js
  8. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/list.wxml
  9. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/list.wxss
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/app-result.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/app-uploader.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-search.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/alert.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  20. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
  22. 1 1
      ghsApp/dist/build/mp-weixin/project.config.json
  23. 17 4
      ghsApp/src/admin/item/detail.vue
  24. 4 4
      ghsApp/src/admin/item/list.vue
  25. 1 1
      ghsApp/src/components/module/app-search.vue
  26. 2 2
      ghsApp/src/pagesStorehouse/stockWarn/manage.vue

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

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

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

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/item/detail.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/item/detail.wxml


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

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

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/item/list.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/item/list.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/item/list.wxss


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

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-uploader.json

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

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

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

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

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/alert.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json

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

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

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

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

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

+ 1 - 1
ghsApp/dist/build/mp-weixin/project.config.json

@@ -41,7 +41,7 @@
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wx21b7c3ef12082099",
-  "projectname": "供应商",
+  "projectname": "%E4%BE%9B%E5%BA%94%E5%95%86",
   "condition": {
     "search": {
       "list": []

+ 17 - 4
ghsApp/src/admin/item/detail.vue

@@ -138,7 +138,7 @@
             placeholder-class="phcolor"
             class="tui-input"
             name="stockWarning"
-            placeholder="如:1扎=20支,请填写20"
+            placeholder="请填写"
             maxlength="50"
             type="number"
           />
@@ -188,8 +188,8 @@ export default {
         name:"",
         py:"",
         ratio:'',
-        bigUnitId:'',
-        smallUnitId:'',
+        bigUnitId:1,
+        smallUnitId:2,
         classId:'',
         cost:'',
         addPrice:'',
@@ -211,6 +211,8 @@ export default {
     if(option.id){
       this.form.id = this.option.id
     }
+
+
   },
   watch:{
   },
@@ -267,7 +269,18 @@ export default {
       this._getAllUnit().then(res=>{
 
       this._getAllItemClass().then(res => {
-        this._getDet();
+
+        if(this.form.id == 0){
+          this.smallUnitSelectedData = this.unitData.filter(
+            e => 2 == e.id
+          )[0];
+        this.bigUnitSelectedData = this.unitData.filter(
+            e => 1 == e.id
+          )[0];
+        }else{
+          this._getDet();
+        }
+
       });
 
       })

+ 4 - 4
ghsApp/src/admin/item/list.vue

@@ -3,11 +3,11 @@
     <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"/>
+				<app-search-module v-model="py" placeholder="输入拼音首字母查询" @input="searchFn"/>
 			</view>
-			<view style="padding:10rpx 0 0 8rpx;" @click="pageTo({ url: '/admin/item/detail' })">
-				<i class="iconfont icontianjiakehu" style="font-size:40rpx;color:#555555;"></i>
-				<span style="font-size:35rpx;color:#555555;margin-left:2rpx;padding-top:3rpx;">添加</span>
+			<view style="padding:10rpx 0 0 14rpx;" @click="pageTo({ url: '/admin/item/detail' })">
+				<i class="iconfont icontianjiakehu" style="font-size:34rpx;color:#999999;"></i>
+				<span style="font-size:30rpx;color:#999999;margin-left:6rpx;margin-right:5rpx;margin-top:10rpx;">添加</span>
 			</view>
 		</view>
 

+ 1 - 1
ghsApp/src/components/module/app-search.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-search-module" :style="{ height: height + 'rpx' }">
-		<div class="map-search" :style="{ backgroundColor: backColor }" style="height: 100rpx">
+		<div class="map-search" :style="{ backgroundColor: backColor }" style="height: 85rpx">
 			<div class="icon-wrap" v-if="isIcon">
 				<i class="iconfont" :class="[icon]"></i>
 			</div>

+ 2 - 2
ghsApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -3,8 +3,8 @@
     <app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
     <view class="input-wrap">
 			<view class="search-bar">
-				<app-search-module v-if="tabs[tabIndex].name=='库存预警'" v-model="py" placeholder="输入商品名拼音首字母查询" @input="searchFnContrapose"/>
-				<app-search-module v-else v-model="py" placeholder="输入商品名拼音首字母查询" @input="searchFn"/>
+				<app-search-module v-if="tabs[tabIndex].name=='库存预警'" v-model="py" placeholder="输入拼音首字母查询" @input="searchFnContrapose"/>
+				<app-search-module v-else v-model="py" placeholder="输入拼音首字母查询" @input="searchFn"/>
 			</view>
       <!--<view v-if="loginInfo.super" class="city-select text-line">-->
 				<!--<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>-->

Неке датотеке нису приказане због велике количине промена