shish 4 лет назад
Родитель
Сommit
a87ed78bb6

+ 0 - 0
ghsApp/src/admin/goodsManage/add.vue → ghsApp/src/admin/goods/add.vue


+ 0 - 0
ghsApp/src/admin/goodsManage/category.vue → ghsApp/src/admin/goods/category.vue


+ 0 - 0
ghsApp/src/admin/goodsManage/freight.vue → ghsApp/src/admin/goods/freight.vue


+ 0 - 0
ghsApp/src/admin/goodsManage/goods-name.vue → ghsApp/src/admin/goods/goods-name.vue


+ 0 - 0
ghsApp/src/admin/goodsManage/img-store.vue → ghsApp/src/admin/goods/img-store.vue


+ 0 - 0
ghsApp/src/admin/goodsManage/list.vue → ghsApp/src/admin/goods/list.vue


+ 0 - 0
ghsApp/src/admin/goodsManage/price-increase.vue → ghsApp/src/admin/goods/price-increase.vue


+ 1 - 1
hdApp/src/admin/goods/add.vue

@@ -173,7 +173,7 @@ export default {
   },
   },
   methods: {
   methods: {
     selectItem(){
     selectItem(){
-      this.pageTo({url:'/admin/goodsManage/selectItem'})
+      this.pageTo({url:'/admin/goods/selectItem'})
     },
     },
     goBack(){
     goBack(){
       uni.navigateBack({delta:1})
       uni.navigateBack({delta:1})

+ 1 - 1
hdApp/src/admin/goods/cgNewPlant.vue

@@ -182,7 +182,7 @@ export default {
       cgPlant({...form}).then(res => {
       cgPlant({...form}).then(res => {
         uni.hideLoading()
         uni.hideLoading()
         if(res.code == 1){
         if(res.code == 1){
-          this.pageTo({url: '/admin/goodsManage/cgNewPlantResult',type:2,query:{id:res.data.id}})
+          this.pageTo({url: '/admin/goods/cgNewPlantResult',type:2,query:{id:res.data.id}})
         }
         }
       })
       })
     },
     },

+ 2 - 2
hdApp/src/admin/goods/flower.vue

@@ -130,7 +130,7 @@ export default {
         this.$msg('请选择商品')
         this.$msg('请选择商品')
         return false
         return false
       }
       }
-      this.$util.pageTo({url:"/admin/goodsManage/flowerConfirm",type:2})
+      this.$util.pageTo({url:"/admin/goods/flowerConfirm",type:2})
     },
     },
     goBottom(){
     goBottom(){
       if (!this.list.finished) {
       if (!this.list.finished) {
@@ -142,7 +142,7 @@ export default {
       }
       }
     },
     },
     newCg(){
     newCg(){
-      this.$util.pageTo({url:"/admin/goodsManage/cgNewPlant",type:2})
+      this.$util.pageTo({url:"/admin/goods/cgNewPlant",type:2})
     },
     },
     init() {
     init() {
       this.getPlantClass()
       this.getPlantClass()

+ 2 - 2
hdApp/src/admin/goods/flowerConfirm.vue

@@ -87,12 +87,12 @@ export default {
       that.$util.confirmModal({content:'确认提交?'},() => {
       that.$util.confirmModal({content:'确认提交?'},() => {
           goodsCreateFn({goods:JSON.stringify(goods),remark:that.form.remark}).then((res) => {
           goodsCreateFn({goods:JSON.stringify(goods),remark:that.form.remark}).then((res) => {
             that.removeFromSaveDirect()
             that.removeFromSaveDirect()
-            that.pageTo({url: '/admin/goodsManage/flowerResult',type:2})
+            that.pageTo({url: '/admin/goods/flowerResult',type:2})
           });
           });
       })
       })
     },
     },
     gobackEvent () {
     gobackEvent () {
-      this.pageTo({url: '/admin/goodsManage/flower',type:2})
+      this.pageTo({url: '/admin/goods/flower',type:2})
     },
     },
   },
   },
 };
 };

+ 1 - 1
hdApp/src/admin/goods/img-store.vue

@@ -78,7 +78,7 @@
     <div class="app-footer">
     <div class="app-footer">
       <button
       <button
         class="admin-button-com middle default"
         class="admin-button-com middle default"
-        @click="pageTo('/admin/goodsManage/category')"
+        @click="pageTo('/admin/goods/category')"
       >查看分类</button>
       >查看分类</button>
       <button class="admin-button-com middle blue" @click="$refs.appUploader.chooseImage()">新增</button>
       <button class="admin-button-com middle blue" @click="$refs.appUploader.chooseImage()">新增</button>
     </div>
     </div>

+ 4 - 4
hdApp/src/admin/goods/list.vue

@@ -125,7 +125,7 @@ export default {
       this.$msg('开发中')
       this.$msg('开发中')
     },
     },
     getStockChange(item){
     getStockChange(item){
-      this.$util.pageTo({url: "/admin/goodsManage/stockChange?id="+item.id})
+      this.$util.pageTo({url: "/admin/goods/stockChange?id="+item.id})
     },
     },
     goBottom(){
     goBottom(){
       if (!this.list.finished) {
       if (!this.list.finished) {
@@ -137,13 +137,13 @@ export default {
       }
       }
     },
     },
     addGoods(){
     addGoods(){
-        this.$util.pageTo({url:"/admin/goodsManage/add"})
+        this.$util.pageTo({url:"/admin/goods/add"})
     },
     },
     cgPlant(){
     cgPlant(){
-      this.$util.pageTo({url:"/admin/goodsManage/plant"})
+      this.$util.pageTo({url:"/admin/goods/plant"})
     },
     },
     edit(id){
     edit(id){
-        this.$util.pageTo({ url: "/admin/goodsManage/detail", query: { id: id } })
+        this.$util.pageTo({ url: "/admin/goods/detail", query: { id: id } })
     },
     },
     getCategoryData() {
     getCategoryData() {
       categoryListB().then(res => {
       categoryListB().then(res => {

+ 2 - 2
hdApp/src/admin/goods/plant.vue

@@ -118,7 +118,7 @@ export default {
         this.$msg('请选择商品')
         this.$msg('请选择商品')
         return false
         return false
       }
       }
-      this.$util.pageTo({url:"/admin/goodsManage/plantConfirm",type:2})
+      this.$util.pageTo({url:"/admin/goods/plantConfirm",type:2})
     },
     },
     goBottom(){
     goBottom(){
       if (!this.list.finished) {
       if (!this.list.finished) {
@@ -130,7 +130,7 @@ export default {
       }
       }
     },
     },
     newCg(){
     newCg(){
-      this.$util.pageTo({url:"/admin/goodsManage/cgNewPlant",type:2})
+      this.$util.pageTo({url:"/admin/goods/cgNewPlant",type:2})
     },
     },
     init() {
     init() {
       this.getPlantClass()
       this.getPlantClass()

+ 2 - 2
hdApp/src/admin/goods/plantConfirm.vue

@@ -87,12 +87,12 @@ export default {
       that.$util.confirmModal({content:'确认提交?'},() => {
       that.$util.confirmModal({content:'确认提交?'},() => {
           cgPlant({goods:JSON.stringify(goods),remark:that.form.remark}).then((res) => {
           cgPlant({goods:JSON.stringify(goods),remark:that.form.remark}).then((res) => {
             that.removeFromSaveDirect()
             that.removeFromSaveDirect()
-            that.pageTo({url: '/admin/goodsManage/cgNewPlantResult',type:2,query:{id:res.data.id}})
+            that.pageTo({url: '/admin/goods/cgNewPlantResult',type:2,query:{id:res.data.id}})
           });
           });
       })
       })
     },
     },
     gobackEvent () {
     gobackEvent () {
-      this.pageTo({url: '/admin/goodsManage/plant',type:2})
+      this.pageTo({url: '/admin/goods/plant',type:2})
     },
     },
   },
   },
 };
 };

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

@@ -34,10 +34,10 @@ 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/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/freight",pf:1}
+                { name: "成品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1},
+                { name: "成品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/category",pf:1},
+                { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/price-increase",pf:1},
+                { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/freight",pf:1}
             ]
             ]
         },
         },
         {
         {

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

@@ -96,13 +96,13 @@ 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/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/hcgl.png`, url: "/admin/goodsManage/list",pf:1 },
+        { name: "成品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/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/kcyjs.png`, url: "/admin/clear/list",pf:0 },
         { name: "采购结账单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",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/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0 },
         { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0 },
-        { name: "成品采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goodsManage/category",pf:1},
+        { name: "成品采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goods/category",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},
       ],
       ],
       totalData: [
       totalData: [

+ 1 - 1
hdApp/src/admin/work/add.vue

@@ -102,7 +102,7 @@ export default {
   },
   },
   methods: {
   methods: {
     selectMake(){
     selectMake(){
-      this.$util.pageTo({ url: "/admin/goodsManage/flower", type: 2 })
+      this.$util.pageTo({ url: "/admin/goods/flower", type: 2 })
     },
     },
     flowerNumChange(e){
     flowerNumChange(e){
       let index = e.detail.value
       let index = e.detail.value

+ 1 - 1
hdApp/src/admin/work/detail.vue

@@ -28,7 +28,7 @@
 				<view class="commodity-view">
 				<view class="commodity-view">
 					<view class="commodity-list">
 					<view class="commodity-list">
 						<view class="commodity-item" >
 						<view class="commodity-item" >
-							<image class="item-icon" :src="goodsInfo.cover" @click="pageTo({url:'/admin/goodsManage/detail',query:{id: goodsInfo.id}})" ></image>
+							<image class="item-icon" :src="goodsInfo.cover" @click="pageTo({url:'/admin/goods/detail',query:{id: goodsInfo.id}})" ></image>
 							<view class="item-info">
 							<view class="item-info">
 								<view class="info-line">
 								<view class="info-line">
 									<text class="item-name">{{ goodsInfo.name }}</text>
 									<text class="item-name">{{ goodsInfo.name }}</text>

+ 1 - 1
hdApp/src/pages.json

@@ -193,7 +193,7 @@
 			]
 			]
 		},
 		},
 		{
 		{
-			"root": "admin/goodsManage",
+			"root": "admin/goods",
 			"pages": [
 			"pages": [
 				{ "path": "list", "style": { "navigationBarTitleText": "商品管理" } },
 				{ "path": "list", "style": { "navigationBarTitleText": "商品管理" } },
 				{ "path": "category", "style": { "navigationBarTitleText": "分类管理" } },
 				{ "path": "category", "style": { "navigationBarTitleText": "分类管理" } },