Merge branch 'master' into Bulbasaur

manager/src/config/index.js

@@ -11,4 +11,5 @@ module.exports = {
   website: "https://www.pickmall.cn", //官网地址
   enableCDN: true, //生产环境 是否启用cdn加载 vue等js
   port: 10003, //端口
+  inputMaxLength:'140' //全局输入框默认最大输入长度字
 };

manager/src/main.js

@@ -8,12 +8,12 @@ import './styles/theme.less';
 import "core-js/stable"
 // import "regenerator-runtime/runtime"
 import App from './App'
-import { router } from './router/index'
+import {router} from './router/index'
 import store from './store'
 import i18n from '@/locale'
 
-import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios'
-import { setStore, getStore, removeStore } from '@/libs/storage'
+import {getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest} from '@/libs/axios'
+import {setStore, getStore, removeStore} from '@/libs/storage'
 import util from '@/libs/util'
 
 import * as filters from '@/utils/filters' // global filter
@@ -23,8 +23,9 @@ import {md5} from '@/utils/md5.js';
 
 // 打印
 import Print from 'vue-print-nb';
+
 Vue.use(Print);
-const { aMapSecurityJsCode } = require("@/config");
+const {aMapSecurityJsCode, inputMaxLength} = require("@/config");
 // 高德安全密钥
 if (aMapSecurityJsCode) {
   window._AMapSecurityConfig = {
@@ -44,14 +45,15 @@ Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码
   return `${WAP_URL}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`
 };
 
-Vue.use(ViewUI, {
-    i18n: (key, value) => i18n.t(key, value)
+
+const copyViewUi = {...ViewUI}
+copyViewUi.Input.props.maxlength.default = inputMaxLength // 挂载最大输入值
+Vue.use(copyViewUi, {
+  i18n: (key, value) => i18n.t(key, value),
 });
 
-Vue.component('liliDialog',liliDialog)
-Vue.component('i18nBox',i18nBox)
-
-
+Vue.component('liliDialog', liliDialog)
+Vue.component('i18nBox', i18nBox)
 
 
 // 挂载全局使用的方法
@@ -66,31 +68,31 @@ Vue.prototype.getStore = getStore;
 Vue.prototype.removeStore = removeStore;
 Vue.prototype.md5 = md5;
 
-Array.prototype.remove = function(from, to) {
-    var rest = this.slice((to || from) + 1 || this.length);
-    this.length = from < 0 ? this.length + from : from;
-    return this.push.apply(this, rest);
+Array.prototype.remove = function (from, to) {
+  var rest = this.slice((to || from) + 1 || this.length);
+  this.length = from < 0 ? this.length + from : from;
+  return this.push.apply(this, rest);
 };
 
 Object.keys(filters).forEach(key => {
-    Vue.filter(key, filters[key])
+  Vue.filter(key, filters[key])
 })
 /* eslint-disable no-new */
 new Vue({
-    el: '#app',
-    router,
-    store,
-    i18n,
-    render: h => h(App),
-    data: {
-        currentPageName: ''
-    },
-    mounted() {
-        // 初始化菜单
-        util.initRouter(this);
-        this.currentPageName = this.$route.name;
-        // 显示打开的页面的列表
-        this.$store.commit('setOpenedList');
-        this.$store.commit('initCachePage');
-    }
+  el: '#app',
+  router,
+  store,
+  i18n,
+  render: h => h(App),
+  data: {
+    currentPageName: ''
+  },
+  mounted() {
+    // 初始化菜单
+    util.initRouter(this);
+    this.currentPageName = this.$route.name;
+    // 显示打开的页面的列表
+    this.$store.commit('setOpenedList');
+    this.$store.commit('initCachePage');
+  }
 })

manager/src/views/distribution/distributionSetting.vue

@@ -14,7 +14,7 @@
         <InputNumber :min="1" :max="365" style="width:100px;" v-model="form.distributionDay"></InputNumber>
       </FormItem>
       <FormItem label="分销结算天数" prop="cashDay">
-        <InputNumber :min="1"  :max="365"  style="width:100px;" v-model="form.cashDay"></InputNumber>
+        <InputNumber :min="0"  :max="365"  style="width:100px;" v-model="form.cashDay"></InputNumber>
       </FormItem>
       <FormItem>
         <Button type="primary" @click="submit">保存</Button>

manager/src/views/member/list/index.vue

@@ -465,10 +465,11 @@ export default {
 
     // 提交修改数据
     handleSubmitModal() {
+      debugger
       const { nickName, sex, username, face, newPassword,id } = this.form;
       let time = new Date(this.form.birthday);
-      let birthday = time ?
-        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate() : '';
+      let birthday = this.form.birthday=== undefined?'':
+        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
       let submit = {
         regionId: this.form.regionId,
         region: this.form.region,

manager/src/views/member/message-manage/weChatMessageManager.vue

@@ -281,6 +281,9 @@ export default {
     wechatFormDataEdit() {
       this.$refs['wechatFormData'].validate((valid) => {
         if (valid) {
+          if(!this.wechatFormData.updateTime){
+            this.wechatFormData.updateTime = ''
+          }
           editWechatMessageTemplate(this.id, this.wechatFormData).then(res => {
             if (res.message === 'success') {
               this.$Message.success('微信模板修改成功');

manager/src/views/promotions/full-discount/full-discount.vue

@@ -169,7 +169,7 @@ export default {
     // 开启或关闭活动
     openOrClose(row) {
       let name = "开启";
-      if (row.promotionStatus === "START") {
+      if (row.promotionStatus === 'NEW' ||row.promotionStatus === "START") {
         name = "关闭";
         this.$Modal.confirm({
           title: "提示",

manager/src/views/seller/shop/shopDetail.vue

@@ -87,7 +87,17 @@
           <p class="item">
             <span class="label">店铺所在地：</span>
             <span class="info">
-              {{storeInfo.storeAddressPath || storeInfo.storeAddressDetail?storeInfo.storeAddressPath +storeInfo.storeAddressDetail:"暂未完善"}}
+              <span>
+                {{
+                (storeInfo.storeAddressPath!==null && storeInfo.storeAddressPath!=='' && storeInfo.storeAddressPath!=="null" && storeInfo.storeAddressPath!==undefined )? storeInfo.storeAddressPath: ""
+                }}
+              </span>
+              <span>
+                {{
+                (storeInfo.storeAddressDetail!==null && storeInfo.storeAddressDetail!=='' && storeInfo.storeAddressDetail!=="null" && storeInfo.storeAddressDetail!==undefined )? storeInfo.storeAddressDetail:""
+                }}
+              </span>
+              {{(storeInfo.storeAddressPath!==null && storeInfo.storeAddressPath!=='' && storeInfo.storeAddressPath!=="null" && storeInfo.storeAddressPath!==undefined) || (storeInfo.storeAddressDetail!==null && storeInfo.storeAddressDetail!=='' && storeInfo.storeAddressDetail!=="null" && storeInfo.storeAddressDetail!==undefined )?"":"暂未完善"}}
             </span>
           </p>
           <p class="item">

manager/src/views/sys/app-version/appVersion.vue

@@ -342,11 +342,13 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.submitLoading = true;
-          const versionUpdateDate = this.$options.filters.unixToDate(
-            this.form.versionUpdateDate / 1000
-          );
-          this.form.versionUpdateDate = versionUpdateDate;
-          this.form.updateTime = versionUpdateDate;
+          if(JSON.stringify(this.form.versionUpdateDate).includes('T')){
+              const versionUpdateDate = this.$options.filters.unixToDate(
+              this.form.versionUpdateDate / 1000
+            );
+            this.form.versionUpdateDate = versionUpdateDate;
+            this.form.updateTime = versionUpdateDate;
+          }
           if (this.modalType == 0) {
             // 添加 避免编辑后传入id等数据 记得删除
             delete this.form.id;