Merge remote-tracking branch 'origin/development' into development

config/dev.env.js

@@ -6,6 +6,8 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   API_URL: '"/"',
   MAX_FILESIZE:'1024*1024*10',
+  SHOP_URL:'"https://w.url.cn/s/AX5b5QN"',
+  PERIODS_URL:'"https://w.url.cn/s/ARs9XI5"',
   IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
   INVITE_URL:'"https://wechat-test.changchangenglish.com/"',
 });

config/prod.env.js

@@ -4,5 +4,7 @@ module.exports = {
   IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
   API_URL: '"/"',
   MAX_FILESIZE:'1024*1024*10',
+  SHOP_URL:'"https://w.url.cn/s/A45jJYk"',
+  PERIODS_URL:'"https://w.url.cn/s/AJi1QsS"',
   INVITE_URL:'"https://wechat.changchangenglish.com/"',
 };

config/test.env.js

@@ -4,5 +4,7 @@ module.exports = {
   IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
   API_URL: '"/"',
   MAX_FILESIZE:'1024*1024*10',
+  SHOP_URL:'"https://w.url.cn/s/AX5b5QN"',
+  PERIODS_URL:'"https://w.url.cn/s/ARs9XI5"',
   INVITE_URL:'"https://wechat-test.changchangenglish.com/"',
 }

src/components/notBuyClass/entrance.vue

@@ -73,8 +73,8 @@
           value: '',
         },
         selectedGoods:[],
-        link1:"https://w.url.cn/s/A45jJYk",  //商品链接
-        link2:"https://w.url.cn/s/AJi1QsS",  //期数链接
+        link1:process.env.SHOP_URL,  //商品链接
+        link2:process.env.PERIODS_URL,  //期数链接
       }
     },
     mounted(){

src/components/qrcode/dialog.vue

@@ -148,6 +148,8 @@
                   size="small">
                   移除
                 </el-button>
+                    <i class="iconfont icon-shangyi"  @click="upIndex(scope.$index, list)" v-if="!$store.state.readonly" style="cursor: pointer;color: #409EFF;margin-left:10px;"></i>
+                    <i class="iconfont icon-xiayi"  @click="downIndex(scope.$index, list)" v-if="!$store.state.readonly"  style="cursor: pointer;color: #409EFF;"></i>
               </template>
             </el-table-column>
           </el-table>
@@ -367,6 +369,28 @@
           });
         })
       },
+      upIndex(index , list){
+          if(index>0){
+            var tempOption = list[index - 1]; 
+            Vue.set(list, index - 1, list[index]); 
+            Vue.set(list, index, tempOption); 
+             this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+          }
+      },
+      downIndex(index , list){
+           if(index < list.length-1){
+            var tempOption = list[index + 1]; 
+            Vue.set(list, index + 1, list[index]); 
+            Vue.set(list, index, tempOption); 
+             this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+          }
+      },
     }
   }
 </script>