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

src/components/Share/shareFriend.vue

@@ -28,18 +28,18 @@
         </div>
         <br>
         <el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0">
-          <el-table-column prop="Id" label="ID" width="60">
+          <el-table-column prop="Id" label="ID" width="50">
           </el-table-column>
-          <el-table-column label="分类名称" width="120">
+          <el-table-column label="分类名称" width="100">
             <template slot-scope="scope">
               <el-tag v-for="tag in scope.row.CateList" style="margin-bottom:3px;" size="small" :key="tag.Id">
                 {{tag.Name}}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="发圈文案" width="300">
+          <el-table-column label="发圈文案" width="250">
             <template slot-scope="scope">
-                <span v-html="scope.row.MaterialInfo"></span>
+              <span v-html="scope.row.MaterialInfo"></span>
               <!-- <img @click="getMaterInfo(scope.row)" style="margin-left:3px;"
                 src="../../assets/img/userman/edit1.png" alt=""> -->
             </template>
@@ -68,7 +68,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="SortNum" label="排序" width="120">
+          <el-table-column prop="SortNum" label="排序" width="100">
             <template slot-scope="scope">
               <div v-if="sort_goods_id != scope.row.Id" flex="dir:left cross:center">
                 <span>{{scope.row.SortNum}}</span>
@@ -76,9 +76,11 @@
                   <img style="margin-left:3px;" src="../../assets/img/userman/edit1.png" alt="">
                 </el-button>
               </div>
-              <div style="display: flex;align-items: center" v-else>
+              <div style="align-items: center" v-else>
                 <el-input style="min-width: 50px" type="text" size="mini"
                   @keyup.native="checkInteger(scope.row,'SortNum')" v-model="scope.row.SortNum"></el-input>
+                <br />
+                <br />
                 <el-button class="change-quit" type="text" style="color: #F56C6C;padding: 0 5px" icon="el-icon-error"
                   circle @click="sort_goods_id=0"></el-button>
                 <el-button class="change-success" type="text" style="margin-left: 0;color: #67C23A;padding: 0 5px"
@@ -87,14 +89,35 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="IsTop" label="是否置顶" width="80">
+          <el-table-column prop="ShareCount" label="分享数量" width="100">
+            <template slot-scope="scope">
+              <div v-if="count_goods_id != scope.row.Id" flex="dir:left cross:center">
+                <span>{{scope.row.ShareCount}}</span>
+                <el-button class="edit-sort" type="text" @click="count_goods_id=scope.row.Id">
+                  <img style="margin-left:3px;" src="../../assets/img/userman/edit1.png" alt="">
+                </el-button>
+              </div>
+              <div style="align-items: center" v-else>
+                <el-input style="min-width: 50px" type="text" size="mini"
+                  @keyup.native="checkInteger(scope.row,'ShareCount')" v-model="scope.row.ShareCount"></el-input>
+                <br />
+                <br />
+                <el-button class="change-quit" type="text" style="color: #F56C6C;padding: 0 5px" icon="el-icon-error"
+                  circle @click="count_goods_id=0"></el-button>
+                <el-button class="change-success" type="text" style="margin-left: 0;color: #67C23A;padding: 0 5px"
+                  icon="el-icon-success" circle @click="count_goods_id=0,updateShareCount(scope.row)">
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="IsTop" label="置顶" width="75">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.IsTop" active-color="#409EFF" :active-value="1" :inactive-value="0"
                 @change="updateIsTop(scope.row)">
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column prop="IsUse" label="状态" width="80">
+          <el-table-column prop="IsUse" label="状态" width="75">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0"
                 @change="updateIsUse(scope.row)">
@@ -145,9 +168,9 @@
               <el-button type="text" @click="isShowGoods=true">选择商品</el-button>
             </el-form-item>
             <el-form-item label="动态文案" prop="MaterialInfo">
-                 <!-- <UeEditor style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true"
+              <!-- <UeEditor style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true"
                 ref="UeEditor1"></UeEditor> -->
-                 <el-input type="textarea" :rows="6" v-model="addMsg.MaterialInfo"></el-input>
+              <el-input type="textarea" :rows="6" v-model="addMsg.MaterialInfo"></el-input>
             </el-form-item>
             <el-form-item>
               <label slot="label">动态图片
@@ -262,6 +285,7 @@
         },
         //编辑行号
         sort_goods_id: 0,
+        count_goods_id: 0,
         //开始时间-结束时间
         dateStr: [],
         loading: false,
@@ -430,7 +454,7 @@
         this.addMsg.LinkUrl = "";
         this.addMsg.IsTop = 1;
         this.addMsg.SortNum = 1;
-        this.defaultMsg="";
+        this.defaultMsg = "";
       },
       //更新是否置顶
       updateIsTop(item) {
@@ -483,6 +507,23 @@
           null
         );
       },
+      //更新分享数量
+      updateShareCount(item) {
+        this.apipost("/api/Share/SetShareFriendCount", {
+            Id: item.Id,
+            ShareCount: item.ShareCount
+          },
+          res => {
+            if (res.data.resultCode === 1) {
+              this.Success(res.data.message);
+              this.getList();
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
       getMaterInfo(item) {
         this.isShowText = true;
         this.updateTextInfo.Id = item.Id;