shish 10 месяцев назад
Родитель
Сommit
f2bbd0960c
3 измененных файлов с 4 добавлено и 33 удалено
  1. 1 1
      hdApp/src/admin/book/index.vue
  2. 3 22
      hdApp/src/admin/goods/category.vue
  3. 0 10
      hdApp/src/admin/home/order.vue

+ 1 - 1
hdApp/src/admin/book/index.vue

@@ -37,7 +37,7 @@ export default {
 	onShareAppMessage(res) {
 		return {
 			title: '花掌柜教学视频',
-			desc: "图文视频教学,带您快速上手",
+			desc: "视频教学,带您快速上手",
 			imageUrl: `${this.$constant.imgUrl}/logo4.png`,
 			path: "admin/book/index",
 		}

+ 3 - 22
hdApp/src/admin/goods/category.vue

@@ -161,21 +161,8 @@ export default {
       operateData: {},
       operateIndex: null,
       operateTop: 0,
-      catItem: [
-        {
-          value: 1,
-          name: '鲜花类',
-          flag: 'flower'
-        },
-        {
-          value: 0,
-          name: '绿植盆栽',
-          flag: 'mater'
-        }
-      ],
-      flower: 2,
       catDisabled: false
-    };
+    }
   },
   computed: {},
   onPullDownRefresh() {
@@ -205,7 +192,6 @@ export default {
       this.modifyModal = true;
       this.modifyTitle = '编辑';
       this.modifyForm = { categoryId: item.id, categoryName: item.categoryName, inTurn: item.inTurn, status: item.status };
-      this.flower = parseInt(item.flower);
       this.catDisabled = true;
     },
     addCategoryFn() {
@@ -215,8 +201,7 @@ export default {
       this.catDisabled = false;
     },
     resetForm() {
-      this.modifyForm = { categoryId: 0, categoryName: '', inTurn: '', status: 1 };
-      this.flower = 2;
+      this.modifyForm = { categoryId: 0, categoryName: '', inTurn: '', status: 1 }
     },
     async init() {
       this._list();
@@ -237,11 +222,7 @@ export default {
       if (form.categoryId && form.categoryId > 0) {
         host = categoryUpdateB;
       }
-      if (Number(this.flower) == 2) {
-        this.$msg('请选择属性');
-        return false;
-      }
-      host({ ...form, flower: this.flower }).then((res) => {
+      host({...form}).then((res) => {
         this.$msg('操作成功!');
         this.modalCancel();
         setTimeout(() => {

+ 0 - 10
hdApp/src/admin/home/order.vue

@@ -67,13 +67,6 @@
         </view>
             <view class="list-button">
 
-              <block v-if="item.payStatus == 1 && item.repeat == 1">
-                <view class="admin-button-com middle" @click.stop="reduceOrderStock(item)">扣库存</view>
-              </block>
-              <block v-else>
-                <view class="admin-button-com middle default" @click.stop="">扣库存</view>                
-              </block>
-
               <block v-if="item.status == 2">
                 <view class="admin-button-com middle" v-if="item.sendType == 1" @click.stop="getOrderFn(item)">确认取货</view>
                 <view class="admin-button-com middle" v-else @click.stop="sendOrderFn(item)">确认发货</view>
@@ -352,9 +345,6 @@ export default {
         this.getOrderList()
       }
     },
-    reduceOrderStock(item){
-      this.$util.pageTo({url:'/admin/billing/index2?customId='+item.customId+'&orderId='+item.id+'&reduceStock=1'})
-    },
     getOrderFn(item){
       let that = this
       that.$util.confirmModal({content:'确认取货?'},() => {