Merge branch 'dev_7.1.0' into fixbug-ZYW

src/app.js

@@ -126,5 +126,6 @@ App({
     // brandId: 1001,
     brandId: 1002,
     // brandId: 3001,
+    // brandId: 3002,
   }
 })

src/component/plus/plus.js

@@ -44,8 +44,8 @@ Component({
       wxService.request({
         url: app.globalData.ctx + '/sale/premium/query',
         header: {
-          'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
-          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8' // 生产
+          // 'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
+          'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8' // 生产
         },
         success: (res) => {
           const { result, data } = res.data

src/pages/refund/refund.js

@@ -64,6 +64,7 @@ wxService.page({
 
     var refundCreateDto = this.data.refundCreateDto
     refundCreateDto.reason = this.data.curType.name // 退款原因
+    refundCreateDto.remark = this.data.refundMark// 说明备注
 
     refundCreateDto.skuList = selectGoods.map(function (item) {
       return {

src/utils/Http.js

@@ -99,8 +99,8 @@ class Http {
         url,
         method: 'GET',
         header: {
-          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
-          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
+          // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
+          'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
           'tentacle-content': this.getTentacle(),
           // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
 
@@ -131,8 +131,8 @@ class Http {
         url,
         method: 'POST',
         header: {
-          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
-          // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
+          // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
+          'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
           'tentacle-content': this.getTentacle()
           // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
         },