更新Note

1. 修复购物车,订单和退单后后置任务正确执行 2. 修复佣金记录金额和详情 3. 修复管理端移动应用界面下订单管理数据统计不准确的问题 4. 修复短信API升级-后台使用一号通 5. 修复用户管理相关问题 6. 修复核销点核销后核销地址不准确 7. 修复资源同步云服务的问题新增功能 1. 秒杀 a. 秒杀时段配置 b. 秒杀商品维护 2. 财务管理 a. 申请提现 b. 财务记录 i. 充值记录 ii. 资金监控 c. 佣金记录 3. 普通商品显示该商品正在参加的活动信息[秒杀]
2020-11-05 16:21:06 +08:00
parent 912cf6403e
commit 6827148d7a
574 changed files with 45105 additions and 4899 deletions
--- a/admin/src/views/store/creatStore/index.vue
+++ b/admin/src/views/store/creatStore/index.vue
@@ -117,7 +117,7 @@
          <el-col :span="24">
            <el-col v-bind="grid">
              <el-form-item label="排序：">
-                <el-input-number v-model="formValidate.sort" placeholder="请输入排序" />
+                <el-input-number v-model="formValidate.sort" :max="9999" placeholder="请输入排序" />
              </el-form-item>
            </el-col>
            <el-col v-bind="grid">
@@ -138,6 +138,23 @@
              </el-checkbox-group>
            </el-form-item>
          </el-col>
+          <el-col :span="24">
+            <el-form-item label="活动优先级：">
+              <div class="color-list acea-row row-middle">
+                <div
+                  class="color-item" :class="activity[item]"
+                  v-for="item in formValidate.activity"
+                  :key="item"
+                  draggable="true"
+                  @dragstart="handleDragStart($event, item)"
+                  @dragover.prevent="handleDragOver($event, item)"
+                  @dragenter="handleDragEnterFont($event, item)"
+                  @dragend="handleDragEnd($event, item)"
+                >{{item}}</div>
+                <div class="tip">可拖动按钮调整活动的优先展示顺序</div>
+              </div>
+            </el-form-item>
+          </el-col>
        </el-row>
        <el-row v-show="currentTab === 3">
          <el-col :span="24">
@@ -386,7 +403,8 @@
    specType: false,
    id: 0,
    couponIds: [],
-    coupons: []
+    coupons: [],
+    activity: ['默认','秒杀','砍价','拼团']
  }
  const objTitle = {
    price: {
@@ -417,6 +435,7 @@
    components: { CreatTemplates },
    data() {
      return {
+        activity: { '默认': 'red', '秒杀': 'blue', '砍价': 'green', '拼团': 'yellow' },
        props2: {
          children: 'child',
          label: 'name',
@@ -867,7 +886,8 @@
            id: info.id,
            giveIntegral: info.giveIntegral,
            ficti: info.ficti,
-            coupons: info.coupons
+            coupons: info.coupons,
+            activity: info.activityStr ? info.activityStr.split(',') : ['默认','秒杀','砍价','拼团']
          }
          if(info.isHot) this.checkboxGroup.push('isHot')
          if(info.isGood) this.checkboxGroup.push('isGood')
@@ -1012,11 +1032,41 @@
        const dst = newItems.indexOf(item)
        newItems.splice(dst, 0, ...newItems.splice(src, 1))
        this.formValidate.sliderImages = newItems;
+      },
+      handleDragEnterFont(e, item) {
+        e.dataTransfer.effectAllowed = 'move'
+        if (item === this.dragging) {
+          return
+        }
+        const newItems = [...this.formValidate.activity]
+        const src = newItems.indexOf(this.dragging)
+        const dst = newItems.indexOf(item)
+        newItems.splice(dst, 0, ...newItems.splice(src, 1))
+        this.formValidate.activity = newItems;
      }
    }
  }
 </script>
 <style scoped lang="scss">
+  .color-item{
+    height: 30px;
+    line-height: 30px;
+    padding: 0 10px;
+    color:#fff;
+    margin-right :10px;
+  }
+  .color-list .color-item.blue{
+    background-color: #1E9FFF;
+  }
+  .color-list .color-item.yellow{
+    background-color: rgb(254, 185, 0);
+  }
+  .color-list .color-item.green{
+    background-color: #009688;
+  }
+  .color-list .color-item.red{
+    background-color: #ed4014;
+  }
  .proCoupon{
    /deep/.el-form-item__content{
      margin-top: 5px;
--- a/admin/src/views/store/index.vue
+++ b/admin/src/views/store/index.vue
@@ -142,7 +142,7 @@
    <el-dialog
      title="复制淘宝、天猫、拼多多、京东、苏宁"
      :visible.sync="dialogVisible"
-      width="1200px"
+      width="1000px"
      :modal="false"
      class="taoBaoModal"
      :before-close="handleClose">
@@ -259,6 +259,7 @@ export default {
        productDeleteApi(id).then(() => {
          this.$message.success('删除成功')
          this.getList()
+          this.goodHeade();
        })
      })
    },
@@ -267,9 +268,11 @@ export default {
        ? putOnShellApi( row.id ).then(() => {
          this.$message.success('上架成功')
          this.getList()
+          this.goodHeade();
        }) : offShellApi(row.id).then(() => {
          this.$message.success('下架成功')
          this.getList()
+          this.goodHeade();
        })
    }
  }
--- a/admin/src/views/store/storeComment/creatComment.vue
+++ b/admin/src/views/store/storeComment/creatComment.vue
@@ -158,7 +158,6 @@
          if (valid) {
            replyCreatApi(this.formValidate).then(() => {
              this.$message.success("新增成功")
-              this.$msgbox.close()
              setTimeout(() => {
                // this.clear();
                this.$emit('getList');
--- a/admin/src/views/store/storeComment/index.vue
+++ b/admin/src/views/store/storeComment/index.vue
@@ -82,14 +82,16 @@
        >
          <template slot-scope="scope">
            <div class="mb5 content_font">{{scope.row.comment}}</div>
-            <div class="demo-image__preview">
-              <el-image
-                :src="item"
-                class='mr5'
-                :preview-src-list="[item]"
-                v-for="(item,index) in scope.row.pics" :key="index"
-              />
-            </div>
+            <template v-if="scope.row.pics.length && scope.row.pics[0]">
+              <div class="demo-image__preview">
+                <el-image
+                  :src="item"
+                  class='mr5'
+                  :preview-src-list="[item]"
+                  v-for="(item,index) in scope.row.pics" :key="index"
+                />
+              </div>
+            </template>
          </template>
        </el-table-column>
        <el-table-column
@@ -123,6 +125,14 @@
          @current-change="pageChange"
        />
      </div>
+      <el-dialog
+        title="提示"
+        :visible.sync="dialogVisible"
+        width="700px"
+        z-index="4"
+        :before-close="handleClose">
+        <creat-comment :key="timer" @getList="seachList"></creat-comment>
+      </el-dialog>
    </el-card>
  </div>
 </template>
@@ -182,7 +192,9 @@ export default {
      timeVal: [],
      loading: false,
      uids: [],
-      options: []
+      options: [],
+      dialogVisible: false,
+      timer: ''
    }
  },
  mounted() {
@@ -205,6 +217,7 @@ export default {
      }
    },
    seachList() {
+      this.dialogVisible = false
      this.tableFrom.page = 1
      this.getList()
    },
@@ -254,38 +267,11 @@ export default {
      })
    },
    add() {
-      const timer = new Date().getTime()
-      const _this = this
-      this.modalFrom(timer,null,function() {
-        _this.getList()
-      })
+      this.dialogVisible = true
+      this.timer = new Date().getTime()
    },
-    modalFrom(timer, callback){
-      const h = this.$createElement
-      this.$msgbox({
-        title: '虚拟评论',
-        customClass: 'creatformModel',
-        message: h('div', { class: 'common-form-upload' }, [
-          h('creatComment', {
-            props: {
-              num: timer
-            },
-            on: {
-              getList() {
-                callback()
-              }
-            }
-          })
-        ]),
-        showCancelButton: false,
-        showConfirmButton: false
-      }).then(() => {
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消'
-        })
-      })
+    handleClose(){
+      this.dialogVisible = false
    },
    // 具体日期
    onchangeTime (e) {
--- a/admin/src/views/store/taoBao.vue
+++ b/admin/src/views/store/taoBao.vue
@@ -131,7 +131,7 @@
              </el-table>
            </el-form-item>
          </el-col>
-          <el-col :span="24" v-if="formValidate.specType">
+          <el-col :span="24">
            <el-form-item label="商品规格：" props="spec_type" label-for="spec_type">
              <el-table :data="ManyAttrValue" border class="tabNumWidth" size="mini">
                <template v-if="manyTabDate">
@@ -453,12 +453,12 @@
              selectRule: info.selectRule,
              isSub: false,
              content: info.content,
-              specType: info.specType,
+              specType: info.specType || false,
              id: info.id,
              giveIntegral: info.giveIntegral,
              ficti: info.ficti
            }
-            if(this.formValidate.attr){
+            if(this.formValidate.attr.length){
              for (var i = 0; i < this.formValidate.attr.length; i++) {
                this.formValidate.attr[i].attrValue = JSON.parse(info.attr[i].attrValues)
              }