Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev

src/components/gitConfig/index.vue → src/components/giftConfig/index.vue

@@ -39,7 +39,13 @@
         <el-table-column prop="gift_num" label="赠品总数">
         </el-table-column>
         <el-table-column prop="stock_num" label="库存数量"></el-table-column>
-        <el-table-column prop="get_num" label="领取数量"></el-table-column>
+        <el-table-column prop="get_num" label="领取数量">
+          <template slot-scope="scope">
+            <router-link class="get_num" :to="{name:'giftDeliverRecord', query: { id: scope.row.id}}" >
+              {{scope.row.get_num}}
+            </router-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
             <div v-if="scope.row.status == 1">上架</div>
@@ -181,4 +187,7 @@
   .container {
     padding: 20px;
   }
+  .get_num {
+    color: #409EFF;
+  }
 </style>

src/components/gitDeliverRecord/index.vue → src/components/giftDeliverRecord/index.vue

@@ -82,6 +82,7 @@
         data() {
             return {
                 searchFrom: {
+                    gift_id: '',
                     gift_name: '',
                     gift_type: '',
                     periods_title: '',
@@ -98,6 +99,7 @@
         methods: {
             getRecordList() {
                 let json = {
+                    gift_id: this.searchFrom.gift_id,
                     gift_name: this.searchFrom.gift_name,
                     gift_type: this.searchFrom.gift_type,
                     periods_title: this.searchFrom.periods_title,
@@ -136,6 +138,10 @@
             },
         },
         created() {
+            let _query = this.$route.query;
+            if (_query && _query.id) {
+                this.searchFrom.gift_id = _query.id;
+            }
             this.getRecordList();
         }
     }

src/components/shop/dialog.vue

@@ -870,7 +870,7 @@
                 })
             },
             getRelationGift() {
-                relationGiftApi().then(res => {
+                relationGiftApi({status: 1}).then(res => {
                     this.relation_gift = res.list;
                 });
             }

src/components/teacherDetail/giftDeliverDialog.vue

@@ -3,7 +3,8 @@
     :title="dialogObj.title"
     center
     append-to-body
-    :visible.sync="dialogObj.show">
+    :visible.sync="dialogObj.show"
+    :close-on-click-modal="false">
     <div v-if="dialogObj.gift_deliver" class="dialog-content">
       <div class="dialog-text">物流已发货，不能修改赠品信息！</div>
       <span slot="footer" class="dialog-footer">
@@ -59,6 +60,13 @@
                 relationGiftApi({goods_id: this.dialogObj.goods_id}).then(res => {
                     this.selectedGiftList = res.list;
                 });
+                relationGiftApi({out_trade_no: this.dialogObj.out_trade_no}).then(res => {
+                    let giftListArr = [];
+                    res.list.forEach(i => {
+                        giftListArr.push(i.id);
+                    });
+                    this.form.selectedGiftList = giftListArr;
+                });
             },
             sub() {
                 this.$refs['form'].validate((valid) => {

src/util/menuList.js

@@ -540,23 +540,23 @@ export default [
         }
       }, {
         value: '赠品配置',
-        routerName: 'gitConfig',
-        path: '/gitConfig',
+        routerName: 'giftConfig',
+        path: '/giftConfig',
         cover: '6-5',
         router: {
-          path: '/gitConfig',
-          name: 'gitConfig',
-          component: e => require(['@/components/gitConfig'], e),
+          path: '/giftConfig',
+          name: 'giftConfig',
+          component: e => require(['@/components/giftConfig'], e),
         }
       }, {
         value: '赠品领取记录',
-        routerName: 'gitDeliverRecord',
-        path: '/gitDeliverRecord',
+        routerName: 'giftDeliverRecord',
+        path: '/giftDeliverRecord',
         cover: '6-6',
         router: {
-          path: '/gitDeliverRecord',
-          name: 'gitDeliverRecord',
-          component: e => require(['@/components/gitDeliverRecord'], e),
+          path: '/giftDeliverRecord',
+          name: 'giftDeliverRecord',
+          component: e => require(['@/components/giftDeliverRecord'], e),
         }
       }
     ]