瀏覽代碼

01/14 14:30

修改团购商品价格
mo 5 年之前
父節點
當前提交
8d4f47c307

文件差異過大導致無法顯示
+ 0 - 0
dist/index.html


文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/chunk-76ee03c8.f73ee2b0.css


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.08987431.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.b5bf95ac.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-0cfd6dc9.ea4f25e7.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-118c0780.4e7085af.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-118c0780.51b08959.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-41f382a0.aeb9501b.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-41f382a0.b96159d9.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-64c33787.2f80f418.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-76ee03c8.ee600b4b.js


+ 1 - 1
src/store/modules/user.js

@@ -66,7 +66,7 @@ const actions = {
           if (!data.data) {
             reject('获取用户信息错误,请重新登录')
           }
-          const username = data.data.username ? data.data.username : data.data.realName;
+          const username = data.data.realName;
           const avatar = data.data.avatar;
           const organ = data.data.organId;
           const organName = data.data.organName;

+ 25 - 19
src/views/resetTeaming/components/resetSound.vue

@@ -239,7 +239,7 @@
               <el-input style="width:80%"
                         @mousewheel.native.prevent
                         type="number"
-                        v-model="item.mode.price"></el-input>
+                        disabled></el-input>
             </div>
             <div class="item">
               <el-input style="width:80%"
@@ -354,7 +354,7 @@ export default {
                 let isLEASE = false
                 let isGROUP = false
                 let depositFee = sub.depositFee
-                let price = sub.price
+                // let price = sub.price
                 if (sub.kitGroupPurchaseTypeJson) {
                   let expectJson = JSON.parse(sub.kitGroupPurchaseTypeJson);
 
@@ -379,7 +379,7 @@ export default {
                     'GROUP': GROUP || 0,
                     'LEASE': LEASE || 0,
                     'depositFee': depositFee || 0, // 保证金
-                    'price': price || 0,// 团购价
+                    // 'price': price || 0,// 团购价
                     'isFREE': isFREE,
                     'isGROUP': isGROUP,
                     'isLEASE': isLEASE,
@@ -482,10 +482,10 @@ export default {
             }
           })
           let kitGroupPurchaseTypeJson = ''
-          let price, depositFee;
+          let depositFee;
           active.fangshi.forEach(fs => {
             if (fs.id == zl) {
-              price = fs.mode.price
+
               depositFee = fs.mode.depositFee
               let types = {}
 
@@ -508,9 +508,8 @@ export default {
             goodsIdList: zl,
             name: goodsItem.name,
             kitGroupPurchaseTypeJson,
-            price,
-            depositFee
-            // price: goodsItem.groupPurchasePrice
+            depositFee,
+            price: goodsItem.groupPurchasePrice
           }
           obj.musicGroupSubjectGoodsGroups.push(some);
         })
@@ -538,16 +537,23 @@ export default {
         }
         obj.musicGroupSubjectPlans.push(item);
       })
-      console.log(obj)
-      return
       // 发请求修改声部信息
-      updateSubjectInfo(obj).then(res => {
-        if (res.code == 200) {
-          this.$message.success('提交成功')
-          // this.$router.push({ path: '/business/teamDetail' })
-          this.getSound();
-        }
-      })
+      this.$confirm(`确定提交?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateSubjectInfo(obj).then(res => {
+          if (res.code == 200) {
+            this.$message.success('提交成功')
+            // this.$router.push({ path: '/business/teamDetail' })
+            this.getSound();
+          }
+        })
+      }).catch(() => { })
+
+
+
 
     },
     // 根据声部id查询可选教辅
@@ -671,10 +677,10 @@ export default {
       for (let i in val) {
         str += `${val[i].shopName}:`
         if (val[i].mode.isFREE) {
-          str += `免费:0,减免金额${val[i].mode['FREE']}\n`
+          str += `免费:减免金额${val[i].mode['FREE']}\n`
         }
         if (val[i].mode.isGROUP) {
-          str += `团购:${val[i].mode.price},减免金额${val[i].mode['GROUP']}\n`
+          str += `团购:减免金额${val[i].mode['GROUP']}\n`
         }
         if (val[i].mode.isLEASE) {
           str += `租赁:${val[i].mode.depositFee},减免金额${val[i].mode['FREE']}\n`

+ 3 - 3
src/views/teamBuild/components/teamBaseInfo.vue

@@ -450,9 +450,6 @@ export default {
       orgianList: []
     }
   },
-  activated () {
-
-  },
   created () {
     this.init();
 
@@ -552,6 +549,9 @@ export default {
             }
           }
         })
+      } else {
+        Object.assign(this.$data, this.$options.data())
+        this.$refs['topinfo'].resetFields()
       }
       // 1.获取各个选项卡的数据内容
       // getSection({ 'delFlag': 0, 'rows': 1000 }).then(res => {

+ 10 - 15
src/views/teamBuild/components/teamSoundMoney.vue

@@ -360,7 +360,7 @@
               <el-input style="width:80%"
                         type="number"
                         @mousewheel.native.prevent
-                        v-model="item.mode.price"></el-input>
+                        disabled></el-input>
             </div>
             <div class="item">
               <el-input style="width:80%"
@@ -368,7 +368,6 @@
                         @mousewheel.native.prevent
                         v-model="item.mode.GROUP"></el-input>
             </div>
-
           </div>
 
           <div class="lineWrap">
@@ -511,7 +510,7 @@ export default {
                       let isLEASE = false
                       let isGROUP = false
                       let depositFee = sub.depositFee
-                      let price = sub.price
+                      // let price = sub.price
                       if (sub.kitGroupPurchaseTypeJson) {
                         let expectJson = JSON.parse(sub.kitGroupPurchaseTypeJson);
 
@@ -537,7 +536,7 @@ export default {
                           'GROUP': GROUP || 0,
                           'LEASE': LEASE || 0,
                           'depositFee': depositFee || 0, // 保证金
-                          'price': price || 0,// 团购价
+                          // 'price': price || 0,// 团购价
                           'isFREE': isFREE,
                           'isGROUP': isGROUP,
                           'isLEASE': isLEASE,
@@ -796,10 +795,9 @@ export default {
               }
             })
             let kitGroupPurchaseTypeJson = ''
-            let price, depositFee;
+            let depositFee;
             active.fangshi.forEach(fs => {
               if (fs.id == zl) {
-                price = fs.mode.price
                 depositFee = fs.mode.depositFee
                 let types = {}
                 if (fs.mode.isFREE) {
@@ -819,9 +817,8 @@ export default {
               type: 'INSTRUMENT',
               goodsIdList: zl,
               name: goodsItem.name,
-              // price: goodsItem.groupPurchasePrice,
+              price: goodsItem.groupPurchasePrice,
               kitGroupPurchaseTypeJson,
-              price,
               depositFee
             }
             obj.musicGroupSubjectGoodsGroups.push(some);
@@ -894,10 +891,9 @@ export default {
               }
             })
             let kitGroupPurchaseTypeJson = ''
-            let price, depositFee;
+            let depositFee;
             active.fangshi.forEach(fs => {
               if (fs.id == zl) {
-                price = fs.mode.price
                 depositFee = fs.mode.depositFee
                 let types = {}
 
@@ -920,9 +916,8 @@ export default {
               goodsIdList: zl,
               name: goodsItem.name,
               kitGroupPurchaseTypeJson,
-              price,
-              depositFee
-              // price: goodsItem.groupPurchasePrice
+              depositFee,
+              price: goodsItem.groupPurchasePrice
             }
             obj.musicGroupSubjectGoodsGroups.push(some);
           })
@@ -1090,10 +1085,10 @@ export default {
       for (let i in val) {
         str += `${val[i].shopName}:`
         if (val[i].mode.isFREE) {
-          str += `免费:0,减免金额${val[i].mode['FREE']}\n`
+          str += `免费:减免金额${val[i].mode['FREE']}\n`
         }
         if (val[i].mode.isGROUP) {
-          str += `团购:${val[i].mode.price},减免金额${val[i].mode['GROUP']}\n`
+          str += `团购:减免金额${val[i].mode['GROUP']}\n`
         }
         if (val[i].mode.isLEASE) {
           str += `租赁:${val[i].mode.depositFee},减免金额${val[i].mode['FREE']}\n`

+ 1 - 1
src/views/vipClass/vipList.vue

@@ -192,7 +192,7 @@
                              slot="reference">停止</el-button>
                 </el-popover>
                 <el-button type="text"
-                           v-if="scope.row.status > 1"
+                           v-if="scope.row.status > 1&&scope.row.status != 3"
                            v-permission="'/vipReset'"
                            @click="resetVip(scope.row.id)">修改</el-button>
               </div>

部分文件因文件數量過多而無法顯示