shish 4 vuotta sitten
vanhempi
commit
958100b51c

+ 12 - 10
hdApp/src/admin/goodsManage/detail.vue

@@ -53,8 +53,8 @@
           </radio-group>
           </radio-group>
         </tui-list-cell>
         </tui-list-cell>
 
 
-        <tui-list-cell class="line-cell" :hover="false" v-if="form.flower == 1">
-          <view class="tui-title">没有库存</view>
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">库存不足</view>
           <radio-group class="tui-input" @change="stockSetChange">
           <radio-group class="tui-input" @change="stockSetChange">
             <label class="list" for="stockCouldOrder">
             <label class="list" for="stockCouldOrder">
               <radio id="stockCouldOrder" value="1" :checked="form.stockSet == 1" style="transform: scale(0.8,0.8);" />
               <radio id="stockCouldOrder" value="1" :checked="form.stockSet == 1" style="transform: scale(0.8,0.8);" />
@@ -159,7 +159,7 @@ import { mapGetters } from "vuex";
 import TuiListCell from "@/components/plugin/list-cell";
 import TuiListCell from "@/components/plugin/list-cell";
 import AppUploader from "@/components/app-uploader";
 import AppUploader from "@/components/app-uploader";
 const form = require("@/utils/formValidation.js");
 const form = require("@/utils/formValidation.js");
-import { getCategory } from "@/utils/config";
+import { getClass } from "@/api/category";
 import { getDetailB, addB, updateB } from "@/api/goods";
 import { getDetailB, addB, updateB } from "@/api/goods";
 //图片上传插件来源:https://ext.dcloud.net.cn/plugin?id=2922 已改造,不能再升级 shish 20211228
 //图片上传插件来源:https://ext.dcloud.net.cn/plugin?id=2922 已改造,不能再升级 shish 20211228
 import htzImageUpload from './components/htz-image-upload/htz-image-upload.vue'
 import htzImageUpload from './components/htz-image-upload/htz-image-upload.vue'
@@ -190,18 +190,14 @@ export default {
         flower:1,
         flower:1,
         flowerNum:0,
         flowerNum:0,
         stockSet:1
         stockSet:1
-      }
+      },
+      categoryData:[]
     };
     };
   },
   },
-  computed: {
-    ...mapGetters({ categoryData: "getCategory" })
-  },
   onLoad() {
   onLoad() {
     const token = uni.getStorageSync('token')
     const token = uni.getStorageSync('token')
     this.headers.token = token
     this.headers.token = token
   },
   },
-  watch:{
-  },
   methods: {
   methods: {
     imgDeleteFn(res){
     imgDeleteFn(res){
       const index = res.index
       const index = res.index
@@ -232,7 +228,13 @@ export default {
         this.form.sold = res.data.sold
         this.form.sold = res.data.sold
         this.currentImgData = res.data.smallImgList
         this.currentImgData = res.data.smallImgList
         this.form.shopImg = res.data.shortImgList
         this.form.shopImg = res.data.shortImgList
-        getCategory(res.data.flower,false)
+        
+        getClass({flower:res.data.flower}).then(res => {
+          if(res.code && res.code == 1){
+            this.categoryData = res.data
+          }
+        })
+
       })
       })
     },
     },
     formSubmit(e) {
     formSubmit(e) {

+ 1 - 1
hdApp/src/admin/home/apply.vue

@@ -34,7 +34,7 @@ export default {
                 {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list",pf:1},
                 {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list",pf:1},
                 {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1",pf:1},
                 {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1",pf:1},
                 {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},
                 {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},
-                { name: "花束盆栽", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1},
+                { name: "盆栽花束", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1},
                 { name: "商品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/category",pf:1},
                 { name: "商品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/category",pf:1},
                 { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/price-increase",pf:1},
                 { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/price-increase",pf:1},
                 { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/freight",pf:1}
                 { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/freight",pf:1}

+ 1 - 1
hdApp/src/admin/home/workbench.vue

@@ -96,7 +96,7 @@ export default {
         { name: "工单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "工单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:0 },
         { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:0 },
         { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:0 },
         { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:0 },
-        { name: "花束盆栽", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1 },
+        { name: "盆栽花束", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1 },
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:0},
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:0},
         { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1 },
         { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1 },

+ 2 - 0
mallApp/src/pages/goods/components/buy-foot.vue

@@ -22,6 +22,8 @@ export default {
     props:['stock'],
     props:['stock'],
 	methods: {
 	methods: {
 		buy() {
 		buy() {
+            this.$msg('开发中')
+            return false
 			this.$emit('buy')
 			this.$emit('buy')
 		},
 		},
         goShop(){
         goShop(){