Merge branch 'feature/hl-2月迭代' into dev

dist/js/main.d38300efeb2e12741ac4.js.LICENSE.txt

+/*!
+ * @overview es6-promise - a tiny implementation of Promises/A+.
+ * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
+ * @license   Licensed under MIT license
+ *            See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
+ * @version   v4.2.6+9869a4bc
+ */
+
+/*!
+ * clipboard.js v2.0.1
+ * https://zenorocha.github.io/clipboard.js
+ * 
+ * Licensed MIT © Zeno Rocha
+ */
+
+/*!
+ * vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
+ * Released under the MIT License.
+ * https://vue-treeselect.js.org/
+ */
+
+/**!
+ * Sortable 1.10.2
+ * @author	RubaXa   <trash@rubaxa.org>
+ * @author	owenm    <owen23355@gmail.com>
+ * @license MIT
+ */

src/components/ruleDetail.vue

@@ -169,6 +169,9 @@ export default {
           } else if (this.ruleForm.memberType == 4) { // 门店筛选器回显
             this.uuid = JSON.parse(this.ruleForm.filterJson).storeWidgetId;
           }
+          if (this.isCopy) {
+            this.ruleForm.creatorId = localStorage.getItem('useId');
+          }
         }
       }).finally(() => {
         this.loading = false;

src/views/goods/ruleList/ruleList.vue

@@ -138,15 +138,23 @@
               >
                 编辑
               </el-button>
-              <el-button
+              <!-- <el-button
                 type="text"
                 @click="$router.push('/copyRule/' + row.integralMallProRuleId)"
                 v-if="$getButtonLimit($buttonCode.ruleListCopy)"
                 :limit-code="$buttonCode.ruleListCopy"
               >
                 复制
+              </el-button> -->
+              <el-button
+                type="text"
+                @click="delRelating(row)"
+                v-if="$getButtonLimit($buttonCode.ruleListDel)"
+                :limit-code="$buttonCode.ruleListDel"
+              >
+                删除
               </el-button>
-              <el-dropdown
+              <!-- <el-dropdown
                 v-if="$getButtonLimit($buttonCode.ruleListDel)"
                 style="margin-left:20px;"
                 placement="bottom-start"
@@ -162,15 +170,8 @@
                     删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
-                <!-- <el-button
-                  type="text"
-                  @click="delRelating(row)"
-                  v-if="$getButtonLimit($buttonCode.ruleListDel)"
-                  :limit-code="$buttonCode.ruleListDel"
-                >
-                  删除
-                </el-button> -->
-              </el-dropdown>
+
+              </el-dropdown> -->
             </template>
           </el-table-column>
         </el-table>
@@ -418,7 +419,6 @@ export default {
     getList () {
       this.loading = true;
       request.get('/api-integral-mall/page-rule', { params: this.form }).then(res => {
-        console.log(res);
         this.tableDate = res.data.result.result || [];
         this.totalCount = res.data.result.totalCount;
       }).finally(_ => {