调整

shop/src/main/java/com/zskk/shop/controller/admin/GoodsManagerController.java

@@ -30,6 +30,7 @@ import com.zskk.shop.dao.entry.GoodPrice;
 import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.service.GoodService;
+import com.zskk.shop.service.SysLabelService;
 
 @Controller
 @RequestMapping("/manage")
@@ -38,6 +39,9 @@ public class GoodsManagerController extends AbstractController{
 	@Autowired
 	private GoodService goodService;
 	
+	@Autowired
+	private SysLabelService sysLabelService;
+	
 	@RequestMapping("/goods")
 	@ResponseBody
 	public ControllerResult goods(@RequestParam(name="search", required=false) String search, @RequestParam(name="status", required=false) Integer status, 
@@ -134,4 +138,10 @@ public class GoodsManagerController extends AbstractController{
 		GoodPrice price = goodService.queryGoodPrice(gid);
 		return new ControllerResult(goodService.toSimpleGoodBean(base, price));
 	}
+	
+	@RequestMapping("getGoodLabels")
+	@ResponseBody
+	public ControllerResult getGoodLabels(@RequestParam("gid") Integer gid){
+		return new ControllerResult(sysLabelService.getGoodLabels(gid));
+	}
 }

shop/src/main/java/com/zskk/shop/controller/admin/SysLabelController.java

@@ -34,6 +34,12 @@ public class SysLabelController  extends AbstractController {
 		return new ControllerResult(sysLabelService.queryAll());
 	}
 	
+	@RequestMapping("/okLabels")
+	@ResponseBody
+	public ControllerResult okLabels(){
+		return new ControllerResult(sysLabelService.queryLabels());
+	}
+	
 	@RequestMapping("/get")
 	@ResponseBody
 	public ControllerResult getOne(@RequestParam("id") Integer id){

shop/src/main/java/com/zskk/shop/dao/SysLabelMapper.java

@@ -27,6 +27,8 @@ public interface SysLabelMapper {
 	
 	public List<GoodLabel> queryLabelGoodids(Integer lid);
 	
+	public List<SysLabel> getGoodLabels(Integer gid);
+	
 	public void addLabelGood(GoodLabel bean);
 	
 	public void delLabelGoods(Integer lid);

shop/src/main/java/com/zskk/shop/service/SysLabelService.java

@@ -41,6 +41,10 @@ public class SysLabelService {
 		return sysLabelMapper.queryLabels();
 	}
 	
+	public List<SysLabel> getGoodLabels(Integer gid){
+		return sysLabelMapper.getGoodLabels(gid);
+	}
+	
 	public List<GoodLabel> queryLabelGoods(Integer lid){
 		return sysLabelMapper.queryLabelGoodids(lid);
 	}

shop/src/main/resource/mapper/SysLabelMapper.xml

@@ -5,7 +5,7 @@
 		select *
 		from sys_label
 	</select>
-	<select id="queryLabels">
+	<select id="queryLabels" resultType="com.zskk.shop.dao.entry.SysLabel">
 		select *
 		from sys_label
 		where status=1
@@ -32,6 +32,11 @@
 		from good_label
 		where lid=#{lid}
 	</select>
+	<select id="getGoodLabels" resultType="com.zskk.shop.dao.entry.SysLabel">
+		select sl.*
+		from good_label gl join  sys_label sl on gl.lid=sl.id
+		where gl.gid=#{gid}
+	</select>
 	<insert id="addLabelGood" parameterType="com.zskk.shop.dao.entry.GoodLabel">
 		insert into good_label(gid, lid, ctime)
 		values(#{gid}, #{lid}, #{ctime})

shop/static/manager/src/api/index.js

@@ -70,8 +70,10 @@ export default {
     getSysLabels: (params, vue) => post(`${serverPath}manage/label/labels`, params, vue),
     getLabel: (params, vue) => post(`${serverPath}manage/label/get`, params, vue),
     saveLabel: (params, vue) => post(`${serverPath}manage/label/save`, params, vue),
-    queryAllMUsers: (params, vue) => post(`${serverPath}/manage/muser/queryAll`, params, vue),
-    setMUserStatus: (params, vue) => post(`${serverPath}/manage/muser/setStatus`, params, vue),
-    sarchUsers: (params, vue) => post(`${serverPath}/manage/muser/sarch`, params, vue),
-    addMUser: (params, vue) => post(`${serverPath}/manage/muser/add`, params, vue),
+    queryAllMUsers: (params, vue) => post(`${serverPath}manage/muser/queryAll`, params, vue),
+    setMUserStatus: (params, vue) => post(`${serverPath}manage/muser/setStatus`, params, vue),
+    sarchUsers: (params, vue) => post(`${serverPath}manage/muser/sarch`, params, vue),
+    addMUser: (params, vue) => post(`${serverPath}manage/muser/add`, params, vue),
+    getGoodLabels: (params, vue) => post(`${serverPath}manage/getGoodLabels`, params, vue),
+    okLabels: (params, vue) => post(`${serverPath}manage/label/okLabels`, params, vue),
 }

shop/static/manager/src/components/page/GoodLabelManage.vue

@@ -0,0 +1,49 @@
+<template>
+    <div>
+        <div class="old">
+            <el-tag v-for="(it, index) in oldLabels" :key="it.id" closable type="success" @close="removeOldLabel(index)">
+                {{it.name}}
+            </el-tag>
+        </div>
+        <div class="new">
+            <el-tag v-for="(it, index) in newLabels" :key="it.id"  type="success">
+                {{it.name}}
+            </el-tag>
+        </div>
+        <div class="option"></div>
+    </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      gid: 0,
+      oldLabels: [],
+      newLabels: []
+    }
+  },
+  methods: {
+    getOldGoodLabels: function() {
+      this.$http.getGoodLabels({ gid: this.gid }, this).then(res => {
+        if (res.code === 0) {
+          this.oldLabels = res.obj
+        }
+      })
+    },
+    getNewGoodLabels: function(){
+        this.$http.okLabels({}, this).then(res => {
+            this.newLabels = res.obj
+        });
+    },
+    removeOldLabel: function(index){
+        this.oldLabels.splice(index, 1)
+    }
+  },
+  mounted() {
+    var gid = this.$route.query.gid
+    this.gid = gid
+    this.getOldGoodLabels()
+    this.getNewGoodLabels()
+  }
+}
+</script>

shop/static/manager/src/components/page/GoodsManager.vue

@@ -66,6 +66,7 @@
                         <el-button type="danger" @click="setStatus(scope.row)">禁用</el-button>
                     </template>
                     <el-button type="text" size="small" @click="goEdit(scope.row)">编辑</el-button>
+                    <el-button type="text" size="small" @click="goEditLabel(scope.row)">标签</el-button>
                     <a :href="serverPath + 'good/detail/' + scope.row.gid" target="_black">
                         <el-button type="text" size="small">预览</el-button>
                     </a>
@@ -156,6 +157,9 @@ export default {
     },
     goEditGoodsDescribe: function(row) {
       this.$router.push({ path: '/editGoodsDescribe', query: { gid: row.gid } })
+    },
+    goEditLabel: function(row) {
+      this.$router.push({ path: '/goodLabelManage', query: { gid: row.gid } })
     }
   },
   mounted: function() {

shop/static/manager/src/router/index.js

@@ -37,6 +37,10 @@ export default new Router({
                 {
                     path: '/addManageUser',
                     component: resolve => require(['../components/page/AddManageUser'], resolve)
+                },
+                {
+                    path: '/goodLabelManage',
+                    component: resolve => require(['../components/page/GoodLabelManage'], resolve)
                 }
             ]
         },