圣诞快乐

# v1.3 更新列表
    1. 【新增】砍价
	2. 【新增】拼团
	3. 【新增】一号通
	4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
	5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
	6. 【修复】微信公众号和小程序头像可能获取不到的问题
	7. 【修复】下单时可能会出错的问题
	8. 【修复】pc管理端用户访问量
	9. 【修复】微信退款
	10. 【修复】管理端订单状态可能出现不正确的情况
	11. 【修复】WEB管理端-菜单色调，短信API更新，首页用户访问量，系统设置tab是自动选择下一及表单
	12. 【修复】系统设置出现更新不正确的问题

admin/src/components/Category/list.vue

@@ -20,12 +20,15 @@
               <el-form inline size="small">
                 <el-form-item>
                   <el-select v-model="listPram.status" placeholder="状态" class="selWidth">
-                    <el-option
-                      v-for="item in constants.roleListStatus"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                    <el-option label="全部" :value="-1"></el-option>
+                    <el-option label="显示" :value="1"></el-option>
+                    <el-option label="不显示" :value="0"></el-option>
+                    <!--<el-option-->
+                      <!--v-for="item in constants.roleListStatus"-->
+                      <!--:key="item.value"-->
+                      <!--:label="item.label"-->
+                      <!--:value="item.value"-->
+                    <!--/>-->
                   </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -78,11 +81,26 @@
                 </template>
               </el-table-column>
               <el-table-column label="排序" prop="sort" min-width="150" />
-              <el-table-column label="启用状态" width="150">
+              <el-table-column
+                label="状态"
+                min-width="150"
+              >
                 <template slot-scope="scope">
-                  <span>{{ scope.row.status | filterYesOrNo }}</span>
+                  <el-switch
+                    v-model="scope.row.status"
+                    :active-value="true"
+                    :inactive-value="false"
+                    active-text="显示"
+                    inactive-text="隐藏"
+                    @change="onchangeIsShow(scope.row)"
+                  />
                 </template>
               </el-table-column>
+              <!--<el-table-column label="启用状态" width="150">-->
+                <!--<template slot-scope="scope">-->
+                  <!--<span>{{ scope.row.status | filterYesOrNo }}</span>-->
+                <!--</template>-->
+              <!--</el-table-column>-->
               <el-table-column label="操作" min-width="200" fixed="right">
                 <template slot-scope="scope">
                   <el-button
@@ -201,6 +219,12 @@ export default {
     // }
   },
   methods: {
+    onchangeIsShow(row){
+      categoryApi.categroyUpdateStatus( row.id ).then(() => {
+        this.$message.success('修改成功')
+        this.handlerGetTreeList()
+      })
+    },
     handleEditMenu(rowData) {
       this.editDialogConfig.isCreate = 1
       this.editDialogConfig.data = rowData

admin/src/components/FormGenerator/components/parser/ZBParser.vue

@@ -2,6 +2,7 @@
   <div>
     <parser
       v-if="formConf.fields.length > 0"
+      v-loading="loading"
       :is-edit="isCreate === 1"
       :form-conf="formConf"
       :form-edit-data="editData"
@@ -40,6 +41,7 @@ export default {
   },
   data() {
     return {
+      loading: false,
       formConf: { fields: [] }
     }
   },
@@ -48,9 +50,13 @@ export default {
   },
   methods: {
     handlerGetFormConfig(formId) { // 获取表单配置后生成table列
+      this.loading = true
       const _pram = { id: formId }
       systemFormConfigApi.getFormConfigInfo(_pram).then(data => {
         this.formConf = JSON.parse(data.content)
+        this.loading = false
+      }).catch(()=>{
+        this.loading = false
       })
     },
     handlerSubmit(formValue) {

admin/src/components/echarts/index.vue

@@ -14,7 +14,7 @@
       //   type: Object,
       //   default: null
       // },
-      series: {
+      seriesData: {
         type: Array,
         default: () => []
       },
@@ -26,6 +26,10 @@
         type: String,
         default: ''
       },
+      yAxisData: {
+        type: Array,
+        default: () => []
+      },
       legendData: {
         type: Array,
         default: () => []
@@ -35,11 +39,11 @@
       return {
         styles: 'height:300px',
         infoLists: this.infoList,
-        seriesArray: this.series
+        seriesArray: this.seriesData
       }
     },
     watch: {
-      series: {
+      seriesData: {
         handler(newVal, oldVal) {
           this.seriesArray = newVal;
           this.handleSetVisitChart();
@@ -83,7 +87,7 @@
                 type: 'pie',
                 radius: '70%',
                 center: ['50%', '60%'],
-                data: this.series || [],
+                data: this.seriesArray || [],
                 emphasis: {
                   itemStyle: {
                     shadowBlur: 10,
@@ -100,9 +104,9 @@
               trigger: 'axis'
             },
             toolbox: {},
-            // legend: {
-            //   data: this.infoLists.legend || []
-            // },
+            legend: {
+              data: this.legendData || []
+            },
             color: ['#1495EB', '#00CC66', '#F9D249', '#ff9900', '#9860DF'],
             grid: {
               left: 16,
@@ -144,7 +148,7 @@
                 data: this.xAxis
               }
             ],
-            yAxis: {
+            yAxis: this.yAxisData.length?this.yAxisData:{
               axisLine: {
                 show: false
               },

admin/src/components/userList/index.vue

@@ -0,0 +1,154 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <el-form inline>
+          <el-form-item>
+            <el-input v-model="tableFrom.keyword" placeholder="请输入用户名称" class="selWidth">
+              <el-button slot="append" icon="el-icon-search" @click="getList" />
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table
+        v-loading="loading"
+        :data="tableData.data"
+        width="800px"
+        size="small"
+      >
+        <el-table-column label="" width="40">
+          <template scope="scope">
+            <el-radio v-model="templateRadio" :label="scope.row.uid" @change.native="getTemplateRow(scope.$index,scope.row)">&nbsp</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="uid"
+          label="ID"
+          min-width="60"
+        />
+        <el-table-column
+          prop="nickname"
+          label="微信用户名称"
+          min-width="130"
+        />
+        <el-table-column label="客服头像" min-width="80">
+          <template slot-scope="scope">
+            <div class="demo-image__preview">
+              <el-image
+                class="tabImage"
+                :src="scope.row.avatar"
+                :preview-src-list="[scope.row.avatar]"
+              />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="性别"
+          min-width="80"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.sex | saxFilter }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="地区"
+          min-width="130"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.addres }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="是否关注公众号"
+          min-width="120"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.sex | saxFilter }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { userListApi } from '@/api/user'
+export default {
+  name: 'UserList',
+  filters: {
+    saxFilter(status) {
+      const statusMap = {
+        0: '未知',
+        1: '男',
+        2: '女'
+      }
+      return statusMap[status]
+    },
+    statusFilter(status) {
+      const statusMap = {
+        'wechat': '微信用户',
+        'routine': '小程序用户'
+      }
+      return statusMap[status]
+    }
+  },
+  data() {
+    return {
+      templateRadio: 0,
+      loading: false,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 10,
+        keyword: ''
+      }
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getTemplateRow(idx, row) {
+       this.$emit('getTemplateRow', row);
+    },
+    // 列表
+    getList() {
+      this.loading = true
+      userListApi(this.tableFrom).then(res => {
+        this.tableData.data = res.list
+        this.tableData.total = res.total
+        this.loading = false
+      }).catch(res => {
+        this.$message.error(res.message)
+        this.loading = false
+      })
+    },
+    pageChange(page) {
+      this.tableFrom.page = page
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>