## v1.3.1 更新列表

1. 【修复】申请退款后积分等操作可能出现错误的问题
	2. 【修复】拼团支付可能出现支付错误的问题
	3. 【修复】退款申请后的订单流程优化和积分赠送的问题
	4. 【修复】回收站中的商品无法恢复的问题
	5. 【修复】一号通短信查询记录不完整的问题
	6. 【修复】用户管理批量加分组，标签的问题
	7. 【修复】积分日志搜索显示有误的问题
	8. 【修复】手动发送优惠券可能会出错的问题
	9. 【修复】核销订单创建在某种条件下会出错的问题
	10. 【修复】移动端商品详情，购物车等样式兼容问题
	11. 【修复】业务流程性的优化

admin/src/views/systemSetting/administratorAuthority/adminList/edit.vue

@@ -41,7 +41,6 @@
 </template>
 
 <script>
-import * as constants from '@/utils/constants.js'
 import * as roleApi from '@/api/role.js'
 import * as systemAdminApi from '@/api/systemadmin.js'
 export default {
@@ -70,7 +69,7 @@ export default {
       }
     }
     return {
-      constants,
+      constants:this.$constants,
       pram: {
         account: null,
         level: null,
@@ -103,7 +102,7 @@ export default {
     handleGetRoleList() {
       const _pram = {
         page: 1,
-        limit: constants.page.limit[4],
+        limit: this.constants.page.limit[4],
         status: 1
       }
       roleApi.getRoleList(_pram).then(data => {

admin/src/views/systemSetting/administratorAuthority/adminList/index.vue

@@ -107,14 +107,13 @@
 <script>
 import * as systemAdminApi from '@/api/systemadmin.js'
 import * as roleApi from '@/api/role.js'
-import * as constants from '@/utils/constants.js'
 import edit from './edit'
 export default {
   // name: "index"
   components: { edit },
   data() {
     return {
-      constants,
+      constants:this.$constants,
       listData: { list: [] },
       listPram: {
         account: null,
@@ -127,7 +126,7 @@ export default {
         roles: null,
         status: null,
         page: 1,
-        limit: constants.page.limit[0]
+        limit: this.$constants.page.limit[0]
       },
       roleList: [],
       menuList: [],
@@ -160,7 +159,7 @@ export default {
     handleGetRoleList() {
       const _pram = {
         page: 1,
-        limit: constants.page.limit[4]
+        limit: this.constants.page.limit[4]
       }
       roleApi.getRoleList(_pram).then(data => {
         this.roleList = data

admin/src/views/systemSetting/administratorAuthority/identityManager/edit.vue

@@ -26,7 +26,6 @@
 
 <script>
 import categoryList from '@/components/Category/list'
-import * as constants from '@/utils/constants.js'
 import * as roleApi from '@/api/role.js'
 export default {
   // name: "edit"
@@ -43,7 +42,7 @@ export default {
   },
   data() {
     return {
-      constants,
+      constants:this.$constants,
       pram: {
         level: 1,
         roleName: null,

admin/src/views/systemSetting/administratorAuthority/identityManager/index.vue

@@ -74,21 +74,20 @@
 <script>
 import * as roleApi from '@/api/role.js'
 import * as categroyApi from '@/api/categoryApi.js'
-import * as constants from '@/utils/constants.js'
 import edit from './edit'
 export default {
   // name: "index"
   components: { edit },
   data() {
     return {
-      constants,
+      constants:this.$constants,
       listData: { list: [] },
       listPram: {
         createTime: null,
         updateTime: null,
         level: null,
         page: 1,
-        limit: constants.page.limit[0],
+        limit: this.$constants.page.limit[0],
         roleName: null,
         rules: null,
         status: null

admin/src/views/systemSetting/administratorAuthority/permissionRules/index.vue

@@ -8,14 +8,13 @@
 import { asyncRoutes, constantRoutes } from '@/router'
 import * as categoryApi from '@/api/categoryApi.js'
 import categoryList from '@/components/Category/list'
-import * as constants from '@/utils/constants.js'
 export default {
   // name: "index"
   components: { categoryList },
   data() {
     return {
       asyncRoutes,
-      constants
+      constants: this.$constants
     }
   },
   mounted() {

admin/src/views/systemSetting/logistics/companyList/index.vue

@@ -115,143 +115,143 @@
 </template>
 
 <script>
-  import parser from '@/components/FormGenerator/components/parser/Parser'
-  import * as systemFormConfigApi from '@/api/systemFormConfig.js'
-  import * as logistics from '@/api/logistics.js'
-  export default {
-    name: 'CompanyList',
-    components: { parser },
-    data() {
-      return {
-        constants:this.$constants,
-        // 表单
-        formConf: { fields: [] },
-        form: {
-          keywords: ''
-        },
-        tableData: {},
-        page: 1,
-        limit: 20,
-        loading: false,
-        dialogVisible: false,
-        fromType: 'add',
-        formData: {
-          status: false
-        },
-        isCreate: 0,
-        formShow: false,
-        editId: 0,
-        rules: {
-          sort: [
-            { required: true, message: '请输入排序', trigger: 'blur' },
-          ],
-          account: [
-            { required: true, message: '请输入月结账号', trigger: 'blur' },
-          ],
-          password: [
-            { required: true, message: '请输入月结密码', trigger: 'blur' },
-          ],
-          netName:  [
-            { required: true, message: '请输入网点名称', trigger: 'blur' },
-          ]
-        }
-      }
-    },
-    created() {
-      this.getExpressList()
-    },
-    methods: {
-      handlerSearch() {
-        this.page = 1
-        this.getExpressList()
+import parser from '@/components/FormGenerator/components/parser/Parser'
+import * as systemFormConfigApi from '@/api/systemFormConfig.js'
+import * as logistics from '@/api/logistics.js'
+export default {
+  name: 'CompanyList',
+  components: { parser },
+  data() {
+    return {
+      constants:this.$constants,
+      // 表单
+      formConf: { fields: [] },
+      form: {
+        keywords: ''
       },
-      //  获取物流公司列表
-      getExpressList() {
-        this.loading = true
-        logistics.expressList({
-          page: this.page,
-          limit: this.limit,
-          keywords: this.form.keywords
-        }).then(res => {
-          this.loading = false
-          this.tableData = res
-        }).catch(()=>{
-          this.loading = false
-        })
+      tableData: {},
+      page: 1,
+      limit: 20,
+      loading: false,
+      dialogVisible: false,
+      fromType: 'add',
+      formData: {
+        status: false
       },
-      // 物流开关
-      bindStatus(item) {
-        logistics.expressUpdateShow({
-          account: item.account,
-          code: item.code,
-          id: item.id,
-          isShow: item.isShow,
-          name: item.name,
-          sort: item.sort
-        }).then(res => {
-          this.$message.success('操作成功')
-          this.getExpressList()
-        }).catch(() => {
-          item.isShow = !item.isShow
-        })
-      },
-      // 分页
-      pageChange(e) {
-        this.page = e
-        this.getExpressList()
-      },
-      handleSizeChange(e) {
-        this.limit = e
-        this.getExpressList()
-      },
-      // 添加物流公司
-      addExpress() {
-        logistics.expressSyncApi().then(data => {
-          this.page = 1
-          this.getExpressList()
-        })
-      },
-      // 删除物流公司
-      bindDelete(item) {
-        this.$modalSure().then(() => {
-          logistics.expressDelete({ id: item.id }).then(res => {
-            this.$message.success('删除成功')
-            this.getExpressList()
-          })
-        })
-      },
-      // 表单提交
-      submit(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            logistics.expressUpdate(this.formData).then(res => {
-              this.$message.success('操作成功')
-              this.handleClose()
-              this.getExpressList()
-            })
-          } else {
-            return false;
-          }
-        });
-      },
-      //  关闭模态框
-      handleClose(done) {
-        this.formShow = false
-        // this.formData = {}
-        this.formConf.fields = []
-        this.dialogVisible = false
-        this.isCreate = 0
-      },
-      // 编辑
-      bindEdit(item) {
-        this.dialogVisible = true
-        this.editId = item.id
-        logistics.expressInfo({ id: item.id }).then(res => {
-          this.formData = res
-        })
+      isCreate: 0,
+      formShow: false,
+      editId: 0,
+      rules: {
+        sort: [
+          { required: true, message: '请输入排序', trigger: 'blur' },
+        ],
+        account: [
+          { required: true, message: '请输入月结账号', trigger: 'blur' },
+        ],
+        password: [
+          { required: true, message: '请输入月结密码', trigger: 'blur' },
+        ],
+        netName:  [
+          { required: true, message: '请输入网点名称', trigger: 'blur' },
+        ]
       }
     }
+  },
+  created() {
+    this.getExpressList()
+  },
+  methods: {
+    handlerSearch() {
+      this.page = 1
+      this.getExpressList()
+    },
+    //  获取物流公司列表
+    getExpressList() {
+      this.loading = true
+      logistics.expressList({
+        page: this.page,
+        limit: this.limit,
+        keywords: this.form.keywords
+      }).then(res => {
+        this.loading = false
+        this.tableData = res
+      }).catch(()=>{
+        this.loading = false
+      })
+    },
+    // 物流开关
+    bindStatus(item) {
+      logistics.expressUpdateShow({
+        account: item.account,
+        code: item.code,
+        id: item.id,
+        isShow: item.isShow,
+        name: item.name,
+        sort: item.sort
+      }).then(res => {
+        this.$message.success('操作成功')
+        this.getExpressList()
+      }).catch(() => {
+        item.isShow = !item.isShow
+      })
+    },
+    // 分页
+    pageChange(e) {
+      this.page = e
+      this.getExpressList()
+    },
+    handleSizeChange(e) {
+      this.limit = e
+      this.getExpressList()
+    },
+    // 添加物流公司
+    addExpress() {
+      logistics.expressSyncApi().then(data => {
+        this.page = 1
+        this.getExpressList()
+      })
+    },
+    // 删除物流公司
+    bindDelete(item) {
+      this.$modalSure().then(() => {
+        logistics.expressDelete({ id: item.id }).then(res => {
+          this.$message.success('删除成功')
+          this.getExpressList()
+        })
+      })
+    },
+    // 表单提交
+    submit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          logistics.expressUpdate(this.formData).then(res => {
+            this.$message.success('操作成功')
+            this.handleClose()
+            this.getExpressList()
+          })
+        } else {
+          return false;
+        }
+      });
+    },
+    //  关闭模态框
+    handleClose(done) {
+      this.formShow = false
+     // this.formData = {}
+      this.formConf.fields = []
+      this.dialogVisible = false
+      this.isCreate = 0
+    },
+    // 编辑
+    bindEdit(item) {
+      this.dialogVisible = true
+      this.editId = item.id
+      logistics.expressInfo({ id: item.id }).then(res => {
+        this.formData = res
+      })
+    }
   }
+}
 </script>
 
 <style lang="scss" scoped>

admin/src/views/systemSetting/setting/index.vue

@@ -60,7 +60,6 @@
 
 <script>
 import parser from '@/components/FormGenerator/components/parser/Parser'
-import * as constants from '@/utils/constants.js'
 import * as categoryApi from '@/api/categoryApi.js'
 import * as selfUtil from '@/utils/ZBKJIutil.js'
 import * as systemFormConfigApi from '@/api/systemFormConfig.js'
@@ -189,28 +188,10 @@ export default {
       let _formId = 0
       systemSettingApi.systemConfigSave(_pram).then(data => {
         this.$message.success('添加数据成功')
-        // 81 82 83
-        // 针对云存储配置特殊处理 切勿随意改动
-        // _formId = parseInt(_pram.id)
-        // if(_formId === 108 || _formId === 81 || _formId === 82 || _formId === 83){
-        //   let _value
-        //   switch (_formId) {
-        //     case 108: _value = 1
-        //       break;
-        //     case 81: _value = 2
-        //       break;
-        //     case 82: _value = 3
-        //       break;
-        //     case 83: _value = 4
-        //       break;
-        //   }
-        //   const _pram = { key:"uploadType",value:_value }
-        //   systemConfigApi.configSaveUniq(_pram)
-        // }
       })
     },
     handlerGetTreeList() {
-      const _pram = { type: constants.categoryType[5].value, status: 1 }
+      const _pram = { type: this.$constants.categoryType[5].value, status: 1 }
       this.loading = true
       categoryApi.treeCategroy(_pram).then(data => {
         this.treeList = this.handleAddArrt(data)

admin/src/views/systemSetting/systemStore/order/index.vue

@@ -129,7 +129,6 @@
 <script>
   import { orderListApi, storeListApi } from '@/api/storePoint'
   import cardsData from '@/components/cards/index'
-  import { fromList } from '@/utils/constants.js'
   export default {
     components: { cardsData },
     data() {
@@ -149,7 +148,7 @@
           limit: 20
         },
         timeVal: [],
-        fromList: fromList,
+        fromList: this.$constants.fromList,
         ids: '',
         cardLists: [],
       }