Merge branch 'master' into qiuqiu

buyer/src/config/index.js

@@ -17,15 +17,15 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'http://192.168.0.109:8890',
+    common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.109:8888',
+    buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.109:8889',
+    seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.109:8887'
+    manager: 'http://192.168.0.100:8887'
 
-    common: 'https://common-api.pickmall.cn',
+    // common: 'https://common-api.pickmall.cn',
-    buyer: 'https://buyer-api.pickmall.cn',
+    // buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn'
+    // manager: 'https://admin-api.pickmall.cn'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',

buyer/src/pages/Merchant.vue

@@ -9,10 +9,12 @@
         <img :src="storeMsg.storeLogo" height="50" alt="">
         <div>
           <p>{{storeMsg.storeName || 'xx店铺'}}</p>
-          <p v-html="storeMsg.storeDesc"></p>
+          <p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
+        </div>
+        <div>
+          <span class="hover-pointer" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
+          <span style="width:80px" class="hover-pointer ml_10" @click="connectCs(storeMsg.yzfSign)"><Icon custom="icomoon icon-customer-service"  />联系客服</span>
         </div>
-        <div class="store-collect" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</div>
-        <span class="hover-pointer ml_10" @click="connectCs(storeMsg.yzfSign)"><Icon custom="icomoon icon-customer-service"  />联系客服</span>
       </div>
     </div>
     <div  class="store-category">
@@ -183,15 +185,25 @@ export default {
   position: relative;
   width: 100%;
   background-color: #666;
-  padding: 10px;
+  padding: 4px;
   color: #fff;
   >div{
     display: flex;
     width: 1200px;
     margin: 0 auto;
     align-items: center;
-    >div{
+
+    img {
+      width: 80px;
+    }
+
+    >div:nth-child(2){
       margin-left: 10px;
+      flex: 1;
+    }
+
+    >div:nth-child(3){
+      width: 200px;
     }
   }
   img {
@@ -202,14 +214,11 @@ export default {
   }
   p:nth-child(2){
     font-size: 14px;
+    max-height: 40px;
+    max-width: 400px;
   }
 }
-.store-collect{
+
-  margin-left: 750px!important;
-  &:hover{
-    cursor: pointer;
-  }
-}
 .store-category {
   background-color: #005aa0;
   color: #fff;

buyer/src/pages/forgetPassword.vue

@@ -1,14 +1,13 @@
 <template>
   <div class="login">
+    <div style="height:50px;"></div>
     <!-- 顶部logo -->
-    <div class="top-content">
+    <div class="logo-box">
-      <div class="logo-box">
+      <img
-        <img
+        :src="logoImg" width='150'
-          src="../assets/images/logo1.png"
+        @click="$router.push('/')"
-          @click="$router.push('/')"
+      />
-        />
+      <div>修改密码</div>
-        <div>修改密码</div>
-      </div>
     </div>
     <div class="login-container">
         <!-- 验证手机号 -->
@@ -119,6 +118,7 @@ export default {
   components: { Verify },
   data () {
     return {
+      logoImg: '', // logo图
       loading: false, // 加载状态
       loading1: false, // 第二步加载状态
       formFirst: { // 手机验证码表单
@@ -242,34 +242,22 @@ export default {
   },
   mounted () {
     this.$refs.formFirst.resetFields();
+    this.logoImg = this.Cookies.getItem('logo')
   },
   watch: {
   }
 };
 </script>
 <style scoped lang="scss">
-.login {
+.logo-box {
-  height: 100%;
+  width: 600px;
-}
-.top-content {
-  width: 100%;
   height: 80px;
-  position: relative;
+  margin: 0 auto;
-  z-index: 1;
+  display: flex;
-  box-shadow: 0 1px 1px #ddd;
+  align-items: center;
-  background-color: #fff;
+  img {
-
+    width: 150px;
-  .logo-box {
+    cursor: pointer;
-    width: 80%;
-    max-width: 1200px;
-    height: 80px;
-    margin: 0 auto;
-    display: flex;
-    align-items: center;
-    img {
-      width: 200px;
-      cursor: pointer;
-    }
   }
   div {
     font-size: 20px;
@@ -278,22 +266,23 @@ export default {
 }
 
 .login-container {
+  border-top: 2px solid $theme_color;
   position: relative;
-  margin: 10px auto;
+  margin: 0 auto;
-  width: 1200px;
+  width: 600px;
   background-color: #fff;
-  padding: 20px;
+  padding: 20px 150px;
   .login-btn{
     position: absolute;
     right: 20px;
-    top: 20px;
+    top: -45px;
   }
 }
 
 .verify-con{
   position: absolute;
-  left: 400px;
+  left: 140px;
-  top: 50px;
+  top: -30px;
   z-index: 10;
 }
 

buyer/src/pages/home/userCenter/MoneyManagement.vue

@@ -258,13 +258,13 @@ export default {
           key: 'rechargeMoney',
           render: (h, params) => {
             if (params.row.payStatus === 'PAID') {
-              return h('div', [h('span',{
+              return h('div', [h('span', {
                 style: {
                   color: 'green'
                 }
               }, this.$options.filters.unitPrice(params.row.rechargeMoney, '+ ¥'))]);
             } else {
-              return h('div', [h('span',this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]);
+              return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]);
             }
           }
         },
@@ -281,7 +281,18 @@ export default {
         },
         {
           title: '支付方式',
-          key: 'rechargeWay'
+          key: 'rechargeWay',
+          render: (h, params) => {
+            if (params.row.rechargeWay === 'ALIPAY') {
+              return h('div', [h('span', {}, '支付宝')]);
+            } else if (params.row.rechargeWay === 'WECHAT') {
+              return h('div', [h('span', {}, '微信')]);
+            } else if (params.row.rechargeWay === 'BANK_TRANSFER') {
+              return h('div', [h('span', {}, '线下转账')]);
+            } else {
+              return h('div', [h('span', {}, '')]);
+            }
+          }
         },
         {
           title: '支付时间',
@@ -308,7 +319,7 @@ export default {
           width: 110,
           render: (h, params) => {
             if (params.row.applyStatus === 'VIA_AUDITING') {
-              return h('div', [h('span',{
+              return h('div', [h('span', {
                 style: {
                   color: 'green'
                 }

buyer/src/pages/payment/thirdPay.vue

@@ -63,6 +63,7 @@ export default {
       this.num++;
       if (this.num >= 7) {
         clearInterval(this.interval);
+        this.interval = null;
       }
       let params = JSON.parse(JSON.stringify(this.$route.query));
       delete params.paymentMethod;
@@ -70,6 +71,7 @@ export default {
       payCallback(params).then(res => {
         if (res.result) {
           clearInterval(this.interval);
+          this.interval = null;
           this.$router.push({path: '/payDone', query: {orderType: this.$route.query.orderType}});
         }
       });

buyer/src/pages/shopEntry/first-apply.vue

@@ -10,7 +10,6 @@
         />
       </FormItem>
       <FormItem prop="storeAddressIdPath" label="公司所在地">
-        <!-- <Input type="text" v-model="form.storeAddressIdPath" placeholder="请选择公司所在地" /> -->
         <region
           style="width: 250px"
           @selected="selectedRegion"
@@ -32,6 +31,13 @@
           ><span slot="append">人</span>
           </Input>
       </FormItem>
+      <FormItem prop="linkPhone" label="公司电话">
+        <Input
+          type="text"
+          v-model="form.companyPhone"
+          placeholder="请填写公司电话"
+          ></Input>
+      </FormItem>
       <FormItem prop="registeredCapital" label="注册资金">
         <Input
           type="text"

buyer/src/pages/shopEntry/shop-entry.vue

@@ -3,7 +3,7 @@
     <div style="height: 20px"></div>
     <div class="content">
       <h3>店铺入驻</h3>
-      <Steps :current="currentIndex" size="small" class="margin">
+      <Steps :current="currentIndex" class="margin">
         <Step title="企业资质信息"></Step>
         <Step title="财务资质信息"></Step>
         <Step title="其他信息"></Step>
@@ -38,38 +38,37 @@
   </div>
 </template>
 <script>
-import { agreement, applyStatus } from "@/api/shopentry";
+import { agreement, applyStatus } from '@/api/shopentry';
-import firstApply from "./first-apply";
+import firstApply from './first-apply';
-import secondApply from "./second-apply";
+import secondApply from './second-apply';
-import thirdApply from "./third-apply";
+import thirdApply from './third-apply';
 export default {
   components: {
     firstApply,
     secondApply,
-    thirdApply,
+    thirdApply
   },
-  data() {
+  data () {
     return {
       currentIndex: 0, // 当前步骤
       showAgreement: false, // 协议显示
-      agreementCon: "", // 协议内容
+      agreementCon: '', // 协议内容
       checked: false, // 选中协议
-      applyData: {}, // 申请数据
       firstData: {}, // 第一步数据
       secondData: {}, // 第二步数据
       thirdData: {}, // 第三步数据
-      storeDisable: "", // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
+      storeDisable: '', // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
-      dataReview: true, // 根据接口返回判断是否可展示数据
+      dataReview: true // 根据接口返回判断是否可展示数据
     };
   },
   methods: {
-    getArticle() {
+    getArticle () {
       // 入驻协议
       agreement().then((res) => {
         this.agreementCon = res.result.content;
       });
     },
-    getData() {
+    getData () { // 获取已填写店铺信息
       applyStatus().then((res) => {
         if (res.success) {
           if (!res.result) {
@@ -78,34 +77,34 @@ export default {
             this.dataReview = false;
             let data = res.result;
             let first = [
-              "addressIdPath",
+              'storeAddressIdPath',
-              "addressPath",
+              'storeAddressPath',
-              "companyAddress",
+              'storeAddressDetail',
-              "companyEmail",
+              'companyEmail',
-              "companyName",
+              'companyName',
-              "employeeNum",
+              'employeeNum',
-              "legalId",
+              'legalId',
-              "legalName",
+              'legalName',
-              "licencePhoto",
+              'licencePhoto',
-              "legalPhoto",
+              'legalPhoto',
-              "licenseNum",
+              'licenseNum',
-              "linkName",
+              'linkName',
-              "linkPhone",
+              'linkPhone',
-              "registeredCapital",
+              'registeredCapital',
-              "scope",
+              'scope'
             ];
             let second = [
-              "settlementBankAccountName",
+              'settlementBankAccountName',
-              "settlementBankAccountNum",
+              'settlementBankAccountNum',
-              "settlementBankBranchName",
+              'settlementBankBranchName',
-              "settlementBankJointName",
+              'settlementBankJointName'
             ];
             let third = [
-              "goodsManagementCategory",
+              'goodsManagementCategory',
-              "storeCenter",
+              'storeCenter',
-              "storeDesc",
+              'storeDesc',
-              "storeLogo",
+              'storeLogo',
-              "storeName",
+              'storeName'
             ];
 
             this.storeDisable = data.storeDisable;
@@ -120,25 +119,28 @@ export default {
               this.thirdData[e] = data[e];
             });
 
-            if (this.storeDisable === "APPLY") {
+            if (this.storeDisable === 'APPLY') {
               this.currentIndex = 0;
             } else {
               this.currentIndex = 3;
             }
-            this.dataReview = true;
+            this.$nextTick(() => {
-            this.$forceUpdate();
+              this.dataReview = true;
+              this.$forceUpdate();
+            })
           }
+          console.log(33333333333333);
         }
       });
     },
-    nextPage(step) {
+    nextPage (step) {
       this.currentIndex = step;
-    },
+    }
   },
-  mounted() {
+  mounted () {
     this.getData();
     this.getArticle();
-  },
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -159,7 +161,7 @@ export default {
 }
 
 .margin {
-  margin: 10px 0;
+  margin: 30px 0;
 }
 .agreeent-con {
   max-height: 500px;

buyer/src/pages/shopEntry/third-apply.vue

@@ -60,17 +60,23 @@
           >
         </Select>
       </FormItem>
-      <FormItem prop="storeCenter" label="经纬度">
+      <FormItem prop="storeCenter" label="店铺定位">
-        <Input
+        <!-- <Input
           type="text"
           v-model="form.storeCenter"
           readonly
           placeholder="点击右侧按钮选择店铺位置"
-        />
+        /> -->
         <Button
-          icon="ios-locate-outline"
+          type="info"
+          v-if="!form.storeCenter"
           @click="$refs.liliMap.showMap = true"
-        ></Button>
+        >点击获取店铺定位</Button>
+        <Button
+          type="success"
+          v-else
+          @click="$refs.liliMap.showMap = true"
+        >已定位</Button>
       </FormItem>
       <FormItem prop="storeDesc" label="店铺简介">
         <Input

buyer/src/pages/user/Home.vue

@@ -15,7 +15,8 @@
           >
             <div class="user-icon">
               <div class="user-img">
-                <img :src="userInfo.face" />
+                <img :src="userInfo.face" v-if="userInfo.face" alt />
+                <Avatar icon="ios-person" class="mb_10" v-else size="96" />
               </div>
               <p>{{userInfo.nickName}}</p>
             </div>
@@ -125,10 +126,6 @@ export default {
   align-items: center;
 }
 
-.user-icon span {
-  font-size: 96px;
-}
-
 .user-img {
   margin-bottom: 15px;
   width: 96px;
@@ -137,10 +134,6 @@ export default {
   overflow: hidden;
 }
 
-.user-img img {
-  width: 100%;
-}
-
 .layout-footer-center {
   padding: 0px 15px;
 

buyer/src/plugins/request.js

@@ -116,6 +116,7 @@ async function refresh (error) {
         });
       },
       onCancel: () => {
+        router.go(0)
         Modal.remove();
       }
     });

manager/src/config/index.js

@@ -21,6 +21,10 @@ export default {
     buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
+    // common: 'http://192.168.0.109:8890',
+    // buyer: 'http://192.168.0.109:8888',
+    // seller: 'http://192.168.0.109:8889',
+    // manager: 'http://192.168.0.109:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",

manager/src/views/home/home.vue

@@ -150,7 +150,7 @@
             <div class="today-item">
               <div>今日交易额</div>
 
-              <span>￥{{homeData.todayOrderPrice | unitPrice }}</span>
+              <span>￥{{homeData.todayOrderPrice ? (homeData.todayOrderPrice  | unitPrice) : 0}}</span>
             </div>
             <div class="today-item">
               <div>今日新增店铺</div>

manager/src/views/member/advance/recharge.vue

@@ -122,6 +122,17 @@
             title: "充值方式",
             key: "rechargeWay",
             width: 120,
+            render: (h, params) => {
+              if (params.row.rechargeWay === 'ALIPAY') {
+                return h('div', [h('span', {}, '支付宝')]);
+              } else if (params.row.rechargeWay === 'WECHAT') {
+                return h('div', [h('span', {}, '微信')]);
+              } else if (params.row.rechargeWay === 'BANK_TRANSFER') {
+                return h('div', [h('span', {}, '线下转账')]);
+              } else {
+                return h('div', [h('span', {}, '')]);
+              }
+            }
           },
           {
             title: "支付状态",

manager/src/views/member/advance/walletLog.vue

@@ -78,7 +78,7 @@ export default {
                       color: "red",
                     },
                   },
-                  this.$options.filters.unitPrice(params.row.money, "￥")
+                  this.$options.filters.unitPrice(-params.row.money, "- ￥")
                 ),
               ]);
             }

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

@@ -324,7 +324,7 @@ export default {
     // 已选择用户数据
     selectedList: {
       type: null,
-      default: "",
+      default: [],
     },
   },
   watch: {

manager/src/views/my-components/verify/index.vue

@@ -18,7 +18,7 @@
 import { getVerifyImg, postVerifyImg } from './verify.js';
 export default {
   props: {
-    verifyType: {
+    verifyType: { // 验证方式，登录，注册等
       defalut: 'LOGIN',
       type: String
     }
@@ -97,9 +97,6 @@ export default {
       });
     }
   },
-  created () {
-    // this.getImg();
-  },
   watch: {
     verifyType: {
       immediate: true,

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

@@ -98,8 +98,8 @@
 
           </p>
           <p class="item">
-            <span class="label">店铺经纬度：</span>
+            <span class="label">店铺定位：</span>
-            <span class="info">{{storeInfo.storeCenter?storeInfo.storeCenter:'暂未完善'}}</span>
+            <span class="info">{{storeInfo.storeCenter?'已定位':'未定位'}}</span>
           </p>
           <p class="item">
             <span class="label">经营范围：</span>

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

@@ -27,8 +27,18 @@
                 </RadioGroup>
               </FormItem>
 
-              <FormItem label="店铺经纬度" prop="shopCenter">
+              <FormItem label="店铺定位" prop="shopCenter">
-                <Input v-model="shopForm.storeCenter" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 350px" />
+                <!-- <Input v-model="shopForm.storeCenter" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 350px" /> -->
+                <Button
+                  type="info"
+                  v-if="!shopForm.storeCenter"
+                  @click="$refs.liliMap.showMap = true"
+                >点击获取店铺定位</Button>
+                <Button
+                  type="success"
+                  v-else
+                  @click="$refs.liliMap.showMap = true"
+                >已定位</Button>
               </FormItem>
 
               <FormItem label="店铺所在地" prop="storeAddressPath">
@@ -267,7 +277,7 @@ export default {
           { required: true, message: "店铺简介不能为空", trigger: "blur" },
         ],
         storeCenter: [
-          { required: true, message: "店铺经纬度不能为空", trigger: "change" },
+          { required: true, message: "店铺未定位", trigger: "change" },
         ],
         companyName: [
           { required: true, message: "公司名称不能为空", trigger: "blur" },

seller/src/config/index.js

@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'https://common-api.pickmall.cn',
+    common: 'https://common-api.pickmall.cn',
-    // buyer: 'https://buyer-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
-    // seller: 'https://store-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
-    // manager: 'https://admin-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn',
-    common: 'http://192.168.0.109:8890',
+    // common: 'http://192.168.0.100:8890',
-    buyer: 'http://192.168.0.109:8888',
+    // buyer: 'http://192.168.0.100:8888',
-    seller: 'http://192.168.0.109:8889',
+    // seller: 'http://192.168.0.100:8889',
-    manager: 'http://192.168.0.109:8887'
+    // manager: 'http://192.168.0.100:8887'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',

seller/src/views/goods/goods-seller/goods.vue

@@ -36,7 +36,7 @@
             <DropdownItem name="uppers">批量上架</DropdownItem>
             <DropdownItem name="lowers">批量下架</DropdownItem>
             <DropdownItem name="deleteAll">批量删除</DropdownItem>
-            <!-- <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem> -->
+            <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem>
           </DropdownMenu>
         </Dropdown>
       </Row>

seller/src/views/goods/goods-seller/goodsOperation.vue

@@ -621,7 +621,7 @@ export default {
         /** 是否重新生成sku */
         regeneratorSkuFlag: false,
         /** 运费模板id **/
-        templateId: 0,
+        templateId: '',
         /** 参数组*/
         goodsParamsDTOList: [],
       },
@@ -685,6 +685,7 @@ export default {
           {required: true, message: "请输入物流参数"},
           {validator: checkWeight},
         ],
+        templateId: [{required: true, message: '请选择物流模板'}],
         sellingPoint: [{required: true, message: "请输入商品卖点"}],
         goodsUnit: [{required: true, message: "请选择计量单位"}],
       },
@@ -763,7 +764,7 @@ export default {
         mobileIntro: "",
         updateSku: true,
         regeneratorSkuFlag: false,
-        templateId: 0,
+        templateId: '',
         goodsParamsDTOList: [],
       };
       this.activestep = 0;
@@ -1548,6 +1549,7 @@ export default {
             this.$Message.error("请上传商品图片");
             return;
           }
+          if (this.baseInfoForm.templateId === '') this.baseInfoForm.templateId = 0;
           let flag = false;
           let paramValue = "";
           // //参数校验

seller/src/views/home/home.vue

@@ -121,7 +121,7 @@
             </div>
 
             <div class="detail-item">
-              <div>
+              <div @click="navigateTo('seckill')">
                 <span>{{homeData.seckillNum || 0}}</span>
                 <div>待参加活动</div>
               </div>

seller/src/views/statistics/order.vue

@@ -48,7 +48,7 @@
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">下单金额</div>
-                  <div class="card-item-value">{{overViewList.orderAmount| unitPrice('￥') }}</div>
+                  <div class="card-item-value">{{overViewList.orderAmount  ? ($options.filters.unitPrice(overViewList.orderAmount )) : 0 }}</div>
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款笔数</div>
@@ -56,7 +56,7 @@
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款金额</div>
-                  <div class="card-item-value">{{overViewList.paymentAmount | unitPrice('￥')}}</div>
+                  <div class="card-item-value">{{ overViewList.paymentAmount ?  ($options.filters.unitPrice(overViewList.paymentAmount)) : 0 }}</div>
                 </div>
 
               </div>