Merge branch 'master' of http://101.200.220.49:8001/xiuli.gao/playlet

project/src/components/manage/memberManage.vue

@@ -50,7 +50,7 @@
             <template slot-scope="scope">
               <div class="flex-align-jus-center">
                 <i class="el-icon-circle-check f16 c-00B38A rMar7" v-if="scope.row.status == 1"></i>
-                <i class="el-icon-warning-outline f16 c-FF604D" v-if="scope.row.status == 4"></i>
+                <i class="el-icon-warning-outline f16 c-FF604D rMar7" v-if="scope.row.status == 4"></i>
                 {{scope.row.status == 1 ? '已授权' : '未授权'}}
               </div>
             </template>

project/src/components/manage/tagManage.vue

@@ -28,15 +28,15 @@
           </div>
         </div>
         <div class="flex-align-center lMarauto editArea">
-          <div class="pointer rMar10 flex-align-center" @click="mIdx>0&&orderList(item.group_id)">
+          <div class="pointer rMar10 flex-align-center" @click="upClick(mIdx)">
             <img src="../../assets/img/upNone.png" alt="" v-if="mIdx == 0">
             <img src="../../assets/img/up.png" alt="" v-if="mIdx > 0">
             上移
           </div>
-          <div class="pointer rMar10 flex-align-center" @click="mIdx < tableData.length-1&&orderList(item.group_id)">
+          <div class="pointer rMar10 flex-align-center" @click="downClick(mIdx)">
             <img src="../../assets/img/downNone.png" alt="" v-if="mIdx == tableData.length-1">
             <img src="../../assets/img/down.png" alt="" v-if="mIdx < tableData.length-1">
-            上移
+            下移
           </div>
           <div class="pointer flex-align-center" @click="addLableGroup('edit',item)">
             <img src="../../assets/img/edit.png" alt="">
@@ -74,15 +74,51 @@ export default {
     this.init(1)
   },
   methods: {
+    // 上移
+    upClick(index) {
+      if(index == 0){return false}
+      this.tableData = this.swapItems(this.tableData, index, index - 1)
+      this.orderList()
+    },
+    // 下移
+    downClick(index) {
+      if(index == this.tableData.length-1){return false}
+      this.tableData = this.swapItems(this.tableData, index, index + 1)
+      this.orderList()
+    },
+    swapItems(arr, index1, index2) {
+      arr[index1] = arr.splice(index2, 1, arr[index1])[0];
+      return arr;
+    },
     orderList(){
-
+      let groupList = []
+      this.tableData.forEach(item=>{
+        groupList.push({order:item.order,group_id:item.group_id})
+      })
+      if(groupList&&groupList.length==0){
+        this.$message({
+          message: '操作错误,请稍候重试',
+          type: "info"
+        })
+        return false
+      }
+      this.$axios.post(this.URL.BASEURL + this.URL.order_tag_group, {
+        group_list: groupList
+      }).then((res) => {
+        var res = res.data
+        if(res&&res.errno == 0){
+          this.init(1)
+          return
+        }
+        this.$message({
+          message: res.err,
+          type: "info"
+        })
+      })
     },
     forceUpdate() {
       this.$forceUpdate()
     },
-    addTag(){
-
-    },
     addLableGroup(opa,item){
       this.source = opa
       this.$nextTick(()=>{