Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/assets/css/common.css

@@ -88,6 +88,9 @@
 .cred{
     color: rgb(245, 108, 108);
 }
+.c99{
+    color:#999999;
+}
 .el-form-item{
     position: relative;
 }

src/components/CommodityMan/goodsServices.vue

@@ -79,7 +79,7 @@
             width="200"
             label="操作">
             <template slot-scope="scope">
-                <img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/edit.png" alt="">
+                <img @click="CommonJump('goodsServicesEdit',{ServiceId:scope.row.Id})" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/edit.png" alt="">
                 <img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
             </template>    
             </el-table-column>

src/components/CommodityMan/goodsServicesEdit.vue

@@ -59,10 +59,14 @@ export default {
                     { required: true, message: '请输入排序', trigger: 'blur' },
                 ],
             },
+            ServiceId:-1,
         }
     },
     created(){
-        // this.getData()
+        if(this.$route.query.ServiceId){
+            this.ServiceId=this.$route.query.ServiceId;
+            this.getData()
+        }
     },
     methods:{
         Save(formName){
@@ -87,7 +91,7 @@ export default {
         },
         getData(){
             this.pageloading=true;
-            this.apipost("/api/product/GetProductRecommendSetInfo",{}, res => {
+            this.apipost("/api/product/GetProductServiceInfo",{ServiceId:this.ServiceId}, res => {
                 this.pageloading=false;
                 if(res.data.resultCode==1){
                     this.addMsg=res.data.data;

src/router/index.js

@@ -212,8 +212,12 @@ export default new Router({
           name: 'goodsList',
           component: resolve => require(['@/components/CommodityMan/goodsList'], resolve),
         },
-
-
+        // 商品管理 商品列表新增
+        {
+          path: '/goodsListEdit',
+          name: 'goodsListEdit',
+          component: resolve => require(['@/components/CommodityMan/goodsListEdit'], resolve),
+        },
         //设置 基础设置
         {
           path: '/basicSetUp',