Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/api/member.js

@@ -59,7 +59,7 @@ export function withdrawalApply (params) {
   });
 }
 
-// 收藏商品、店铺
+// 收藏商品
 export function collectGoods (type, id) {
   return request({
     url: `/buyer/member/collection/add/${type}/${id}`,
@@ -68,7 +68,16 @@ export function collectGoods (type, id) {
   });
 }
 
-// 取消 收藏商品、店铺
+// 收藏店铺
+export function collectStore (type, id) {
+  return request({
+    url: `/buyer/member/storeCollection/add/${type}/${id}`,
+    method: Method.POST,
+    needToken: true
+  });
+}
+
+// 取消 收藏商品
 export function cancelCollect (type, id) {
   return request({
     url: `/buyer/member/collection/delete/${type}/${id}`,
@@ -77,7 +86,16 @@ export function cancelCollect (type, id) {
   });
 }
 
-// 查看是否收藏
+// 取消 收藏店铺
+export function cancelStoreCollect (type, id) {
+  return request({
+    url: `/buyer/member/storeCollection/delete/${type}/${id}`,
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+// 查看是否收藏商品
 export function isCollection (type, goodsId) {
   return request({
     url: `/buyer/member/collection/isCollection/${type}/${goodsId}`,
@@ -86,7 +104,16 @@ export function isCollection (type, goodsId) {
   });
 }
 
-// 会员收藏列表
+// 查看是否收藏店铺
+export function isStoreCollection (type, goodsId) {
+  return request({
+    url: `/buyer/member/storeCollection/isCollection/${type}/${goodsId}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 会员收藏商品列表
 export function collectList (params) {
   return request({
     url: `/buyer/member/collection/${params.type}`,
@@ -96,6 +123,16 @@ export function collectList (params) {
   });
 }
 
+// 会员收藏店铺列表
+export function storeCollectList (params) {
+  return request({
+    url: `/buyer/member/storeCollection/${params.type}`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
 // 单个商品评价
 export function goodsComment (params) {
   return request({

buyer/src/pages/GoodsDetail.vue

@@ -44,9 +44,9 @@ import ShowGoods from "@/components/goodsDetail/ShowGoods";
 import ShowGoodsDetail from "@/components/goodsDetail/ShowGoodsDetail";
 import { goodsSkuDetail } from "@/api/goods";
 import {
-  cancelCollect,
+  cancelStoreCollect,
-  collectGoods,
+  collectStore,
-  isCollection,
+  isStoreCollection,
   getGoodsDistribution,
 } from "@/api/member";
 import { getDetailById } from "@/api/shopentry";
@@ -121,7 +121,7 @@ export default {
             this.$set(this, "goodsMsg", res.result);
             // 判断是否收藏
             if (this.Cookies.getItem("userInfo")) {
-              isCollection("STORE", this.goodsMsg.data.storeId).then((res) => {
+              isStoreCollection("STORE", this.goodsMsg.data.storeId).then((res) => {
                 if (res.success && res.result) {
                   this.storeCollected = true;
                 }
@@ -159,13 +159,13 @@ export default {
     async collect () {
       // 收藏店铺
       if (this.storeCollected) {
-        let cancel = await cancelCollect("STORE", this.goodsMsg.data.storeId);
+        let cancel = await cancelStoreCollect("STORE", this.goodsMsg.data.storeId);
         if (cancel.success) {
           this.$Message.success("已取消收藏");
           this.storeCollected = false;
         }
       } else {
-        let collect = await collectGoods("STORE", this.goodsMsg.data.storeId);
+        let collect = await collectStore("STORE", this.goodsMsg.data.storeId);
         if (collect.code === 200) {
           this.storeCollected = true;
           this.$Message.success("收藏店铺成功,可以前往个人中心我的收藏查看");

buyer/src/pages/Merchant.vue

@@ -108,7 +108,7 @@
 <script>
 
 import {getDetailById, getCateById} from "@/api/shopentry";
-import {cancelCollect, collectGoods, isCollection} from "@/api/member";
+import {cancelStoreCollect, collectStore, isStoreCollection} from "@/api/member";
 import {goodsList} from "@/api/goods";
 import Search from "@/components/Search";
 import ModelForm from "@/components/indexDecorate/ModelForm";
@@ -296,13 +296,13 @@ export default {
     async collect() {
       // 收藏店铺
       if (this.storeCollected) {
-        let cancel = await cancelCollect("STORE", this.storeMsg.storeId);
+        let cancel = await cancelStoreCollect("STORE", this.storeMsg.storeId);
         if (cancel.success) {
           this.$Message.success("已取消收藏");
           this.storeCollected = false;
         }
       } else {
-        let collect = await collectGoods("STORE", this.storeMsg.storeId);
+        let collect = await collectStore("STORE", this.storeMsg.storeId);
         if (collect.code === 200) {
           this.storeCollected = true;
           this.$Message.success("收藏店铺成功,可以前往个人中心我的收藏查看");

buyer/src/pages/home/memberCenter/Distribution.vue

@@ -527,7 +527,7 @@ export default {
   top: -200px;
   left: 200px;
 }
-/depp/ .ivu-alert-message {
+/deep/ .ivu-alert-message {
   p {
     margin: 4px 0;
   }

buyer/src/pages/home/memberCenter/Favorites.vue

@@ -25,7 +25,7 @@
             <Button size="small" type="primary" @click="buynow(item.skuId, item.goodsId)" v-if="params.type === 'GOODS'">立即购买</Button>
             <Button size="small" type="primary" @click="goShop(item.id)" v-else>店铺购买</Button>
             <Button size="small" v-if="params.type === 'GOODS'" @click="cancel(item.skuId)">取消收藏</Button>
-            <Button size="small" v-if="params.type === 'SHOP'" @click="cancel(item.id)">取消收藏</Button>
+            <Button size="small" v-if="params.type === 'STORE'" @click="cancelStore(item.id)">取消收藏</Button>
           </div>
         </div>
       </template>
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { collectList, cancelCollect } from '@/api/member.js'
+import { collectList, cancelCollect,storeCollectList,cancelStoreCollect} from '@/api/member.js'
 export default {
   name: 'Favorites',
   props: {
@@ -66,10 +66,16 @@ export default {
         if (res.success) this.list = res.result.records;
       })
     },
+    getStoreList () { // 获取收藏列表
+      this.spinShow = true
+      storeCollectList(this.params).then(res => {
+        this.spinShow = false
+        if (res.success) this.list = res.result.records;
+      })
+    },
     change (index) { // tab栏切换
-      if (index === 0) { this.params.type = 'GOODS' }
+      if (index === 0) { this.params.type = 'GOODS',this.getList()}
-      if (index === 1) { this.params.type = 'SHOP' }
+      if (index === 1) { this.params.type = 'STORE',this.getStoreList()}
-      this.getList()
     },
     cancel (id) { // 取消收藏
       let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
@@ -85,6 +91,20 @@ export default {
         }
       });
     },
+    cancelStore (id) { // 取消收藏
+      let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
+      this.$Modal.confirm({
+        title: 'Title',
+        content: `<p>确定取消收藏该${typeName}吗？</p>`,
+        onOk: () => {
+          cancelStoreCollect(this.params.type, id).then(res => {
+            if (res.success) {
+              this.getStoreList();
+            }
+          })
+        }
+      });
+    },
     buynow (skuId, goodsId) { // 跳转详情
       let url = this.$router.resolve({
         path: '/goodsDetail',

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 ?
+      let birthday = this.form.birthday=== undefined?'':
-        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate() : '';
+        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
       let submit = {
         regionId: this.form.regionId,
         region: this.form.region,

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/setting-manage/setting/LOGISTICS_SETTING.vue

@@ -5,21 +5,40 @@
         <RadioGroup v-model="formValidate.type" type="button">
           <Radio label="KDNIAO">快递鸟</Radio>
           <Radio label="KUAIDI100">快递100</Radio>
+          <Radio label="SHUNFENG">顺丰</Radio>
         </RadioGroup>
       </FormItem>
-      <FormItem v-if="formValidate.type==='KDNIAO'" label="快递鸟 商户ID" prop="kdniaoEbusinessID">
+      <FormItem v-if="formValidate.type === 'KDNIAO'" label="快递鸟 商户ID" prop="kdniaoEbusinessID">
         <Input v-model="formValidate.kdniaoEbusinessID" />
       </FormItem>
-      <FormItem v-if="formValidate.type==='KDNIAO'" label="快递鸟 AppKey" prop="kdniaoAppKey">
+      <FormItem v-if="formValidate.type === 'KDNIAO'" label="快递鸟 AppKey" prop="kdniaoAppKey">
         <Input class="label-appkey" v-model="formValidate.kdniaoAppKey" />
       </FormItem>
 
-      <FormItem v-if="formValidate.type==='KUAIDI100'" label="快递100 授权码" prop="kuaidi100Customer">
+      <FormItem v-if="formValidate.type === 'KUAIDI100'" label="快递100 授权码" prop="kuaidi100Customer">
         <Input class="label-appkey" v-model="formValidate.kuaidi100Customer" />
       </FormItem>
-      <FormItem v-if="formValidate.type==='KUAIDI100'" label="快递100 Key" prop="kuaidi100Key">
+      <FormItem v-if="formValidate.type === 'KUAIDI100'" label="快递100 Key" prop="kuaidi100Key">
         <Input class="label-appkey" v-model="formValidate.kuaidi100Key" />
       </FormItem>
+      <div v-if="formValidate.type === 'SHUNFENG'">
+        <FormItem label="顾客编码" prop="clientCode">
+          <Input v-model="formValidate.clientCode" />
+        </FormItem>
+        <FormItem label="校验码" prop="checkWord">
+          <Input v-model="formValidate.checkWord" />
+        </FormItem>
+        <FormItem label="请求地址" prop="callUrl">
+          <Input class="label-appkey" v-model="formValidate.callUrl" />
+        </FormItem>
+
+        <FormItem label="打印模板" prop="templateCode">
+          <Input class="label-appkey" v-model="formValidate.templateCode" />
+        </FormItem>
+        <FormItem label="月结号" prop="monthlyCardNo">
+          <Input class="label-appkey" v-model="formValidate.monthlyCardNo" />
+        </FormItem>
+      </div>
       <div class="label-btns">
         <Button type="primary" @click="submit('formValidate')">保存</Button>
       </div>
@@ -36,12 +55,13 @@ export default {
       formValidate: {   // 表单数据
         type: "",
         kdniaoEbusinessID: "",
-        kdniaoAppKey: "" ,
+        kdniaoAppKey: "",
-        kuaidi100Customer: "" ,
+        kuaidi100Customer: "",
-        kuaidi100Key: "" ,},
+        kuaidi100Key: "",
+      },
     };
   },
-  props: ["res",'type'],
+  props: ["res", 'type'],
   created() {
     this.init();
   },
@@ -49,7 +69,7 @@ export default {
     // 验证
     submit(name) {
       let that = this;
-       if( handleSubmit(that, name )){
+      if (handleSubmit(that, name)) {
         this.setupSetting()
       }
     },
@@ -83,15 +103,17 @@ export default {
 
 <style lang="scss" scoped>
 @import "./style.scss";
+
 .label-item {
   display: flex;
 }
+
 /deep/ .ivu-input {
   width: 300px !important;
   margin: 0 10px;
 }
+
 .ivu-input-wrapper {
   width: 300px;
   margin-right: 10px;
-}
+}</style>
-</style>

seller/src/api/common.js

@@ -1,4 +1,4 @@
-import { commonUrl, getRequest, uploadFileRequest ,uploadFile} from "@/libs/axios";
+import { commonUrl, getRequest, uploadFileRequest, uploadFile, request} from "@/libs/axios";
 
 // 通过id获取子地区
 export const getChildRegion = (id) => {
@@ -25,3 +25,10 @@ export const upLoadFileMethods = (bold) => {
   console.log(bold)
   return uploadFileRequest(uploadFile, bold);
 };
+
+/**
+ * 发送短信验证码
+ */
+export function sendSms (params) {
+  return getRequest(`${commonUrl}/common/common/sms/${params.verificationEnums}/${params.mobile}`,params);
+}

seller/src/api/index.js

@@ -37,6 +37,11 @@ export const login = params => {
   return postRequestWithNoTokenData("/passport/login/userLogin", params);
 };
 
+// 手机登陆
+export const storeSmsLogin = params => {
+  return postRequestWithNoToken("/passport/login/smsLogin", params);
+};
+
 // 登出
 export const logout = () => {
   return postRequest("/passport/login/logout");
@@ -50,7 +55,10 @@ export const userInfo = params => {
 export const userMsg = params => {
   return getRequest('/settings/storeSettings', params)
 }
-
+//验证短信验证码
+export const validateCode = params => {
+  return postRequestWithNoToken("/passport/login/resetByMobile", params);
+};
 // 初始化验证码
 export const initCaptcha = params => {
   return getRequestWithNoToken("/common/captcha/init", params);
@@ -107,6 +115,10 @@ export const sendCodeEmail = (email, params) => {
 export const editEmail = params => {
   return postRequest("/email/editEmail", params);
 };
+// 忘记密码并修改
+export const forgetAndModify = params => {
+  return postRequest("/passport/login/resetPassword", params);
+};
 // 个人中心修改密码
 export const changePass = params => {
   return postRequest("/passport/login/modifyPass", params);

seller/src/api/logistics.js

@@ -4,6 +4,7 @@ import {
   postRequest,
   putRequest,
   deleteRequest,
+  getRequestHasHeader,
   importRequest,
   getRequestWithNoToken
 } from "@/libs/axios";
@@ -35,4 +36,13 @@ export const getCheckedOn = params =>{
   return getRequest(`/other/logistics/getCheckedFaceSheet`,params);
 }
 
+//获取物流设置
+export const getLogisticsSetting = () =>{
+  return getRequest(`/other/logistics`);
+}
+
+export const getShunFengFaceSheet = (url,headers) =>{
+  return getRequestHasHeader(`${url}`,null,headers);
+}
+
 

seller/src/api/order.js

@@ -81,6 +81,11 @@ export const orderDelivery = (sn, params) => {
   return postRequest(`/order/order/${sn}/delivery`, params);
 };
 
+// 订单发货
+export const orderShunFengDelivery = (sn) => {
+  return postRequest(`/order/order/${sn}/shunfeng/delivery`);
+};
+
 // 获取商家选中的物流公司
 export const getLogisticsChecked = () => {
   return getRequest(`/other/logistics/getChecked`);

seller/src/libs/axios.js

@@ -188,6 +188,38 @@ export const getRequest = (url, params, resBlob) => {
   return service(data);
 };
 
+export const getRequestHasHeader = (url, params, headers) => {
+  let accessToken = getStore("accessToken");
+  let data = {
+    method: "get",
+    url: `${url}`,
+    params: params,
+    transformRequest: headers
+      ? undefined
+      : [
+          function(data) {
+            let ret = "";
+            for (let it in data) {
+              ret +=
+                encodeURIComponent(it) +
+                "=" +
+                encodeURIComponent(data[it]) +
+                "&";
+            }
+            ret = ret.substring(0, ret.length - 1);
+            return ret;
+          }
+        ],
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      accessToken: accessToken,
+      ...headers
+    },
+    responseType: "blob"
+  };
+  return service(data);
+};
+
 export const postRequest = (url, params, headers) => {
   let accessToken = getStore("accessToken");
   return service({

seller/src/router/index.js

@@ -3,7 +3,7 @@ import ViewUI from 'view-design';
 import Util from '../libs/util';
 import VueRouter from 'vue-router';
 import Cookies from 'js-cookie';
-import {routers} from './router';
+import { routers } from './router';
 
 Vue.use(VueRouter);
 
@@ -16,10 +16,10 @@ const RouterConfig = {
 /**
  * 解决重复点击菜单会控制台报错bug
  */
- const routerPush = VueRouter.prototype.push
+const routerPush = VueRouter.prototype.push
- VueRouter.prototype.push = function push(location) {
+VueRouter.prototype.push = function push(location) {
-   return routerPush.call(this, location).catch(error=> error)
+  return routerPush.call(this, location).catch(error => error)
- }
+}
 
 export const router = new VueRouter(RouterConfig);
 
@@ -32,10 +32,15 @@ router.beforeEach((to, from, next) => {
   const name = to.name;
 
   if (!Cookies.get('userInfoSeller') && name !== 'login') {
-    // 判断是否已经登录且前往的页面不是登录页
+    if (name === 'forgetPassword') {
-    next({
+      console.log(name)
-      name: 'login'
+      Util.toDefaultPage([...routers], name, router, next);
-    });
+    } else {
+      // 判断是否已经登录且前往的页面不是登录页
+      next({
+        name: 'login'
+      });
+    }
   } else if (Cookies.get('userInfoSeller') && name === 'login') {
     // 判断是否已经登录且前往的是登录页
     Util.title();

seller/src/router/router.js

@@ -10,6 +10,11 @@ export const loginRouter = {
   },
   component: () => import("@/views/login.vue")
 };
+export const forgetPasswordRouter = {
+  path: "/forgetPassword",
+  name: "forgetPassword",
+  component: () => import("@/views/ForgetPassword.vue")
+};
 
 // 作为Main组件的子页面展示但是不在左侧菜单显示的路由写在otherRouter里
 export const otherRouter = {
@@ -193,4 +198,4 @@ export const page500 = {
   component: () => import("@/views/error-page/500.vue")
 };
 // 所有上面定义的路由都要写在下面的routers里
-export const routers = [loginRouter, otherRouter, page500, page403];
+export const routers = [loginRouter, forgetPasswordRouter, otherRouter, page500, page403];

seller/src/views/ForgetPassword.vue

@@ -0,0 +1,331 @@
+<template>
+  <div class="forget-password" @click='$refs.verify.show = false'>
+    <div style="height:50px;"></div>
+    <!-- 顶部logo -->
+    <div class="logo-box">
+      <img
+        :src="$store.state.logoImg" width='150'
+        @click="$router.push('/')"
+      />
+      <div>修改密码</div>
+    </div>
+    <div class="login-container">
+        <!-- 验证手机号 -->
+        <Form
+          ref="formFirst"
+          :model="formFirst"
+          :rules="ruleInline"
+          style="width:300px;"
+          v-show="step === 0"
+        >
+          <FormItem prop="mobile">
+            <i-input
+              type="text"
+              v-model="formFirst.mobile"
+              clearable
+              placeholder="手机号"
+            >
+              <Icon type="md-phone-portrait" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="code">
+            <i-input
+              type="text"
+              v-model="formFirst.code"
+              clearable
+              placeholder="手机验证码"
+            >
+              <Icon
+                type="ios-text-outline"
+                style="font-weight: bold"
+                slot="prepend"
+              />
+              <Button slot="append" @click="sendCode">{{ codeMsg }}</Button>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button @click="verifyBtnClick" long :type="verifyStatus?'success':'default'">{{verifyStatus?'验证通过':'点击完成安全验证'}}</Button>
+          </FormItem>
+          <FormItem>
+            <Button type="error" @click="next" :loading="loading" long>下一步</Button>
+          </FormItem>
+        </Form>
+        <Form
+          ref="form"
+          :model="form"
+          :rules="ruleInline"
+          style="width:300px;"
+          v-show="step === 1"
+        >
+          <FormItem prop="password">
+            <i-input
+              type="password"
+              v-model="form.password"
+              clearable
+              placeholder="请输入至少六位密码"
+            >
+              <Icon type="md-lock" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="password">
+            <i-input
+              type="password"
+              v-model="form.oncePasd"
+              clearable
+              placeholder="请再次输入密码"
+            >
+              <Icon type="md-lock" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button type="error" size="large" @click="handleSubmit" :loading="loading1" long>提交</Button>
+          </FormItem>
+        </Form>
+        <!-- 拼图验证码 -->
+        <verify
+          ref="verify"
+          class="verify-con"
+          :verifyType="verifyType"
+          @change="verifyChange"
+        ></verify>
+        <div class="login-btn"><a @click="$router.push('login')">前往登录</a></div>
+    </div>
+    <div class="foot">
+      <Row type="flex" justify="space-around" class="help">
+        <a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
+      </Row>
+      <Row type="flex" justify="center" class="copyright">
+        Copyright © {{year}} - Present
+        <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"
+          >{{config.title}}</a
+        >
+        版权所有
+      </Row>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import * as RegExp from '@/utils/regular.js';
+import * as apiLogin from '@/api/index.js';
+import { sendSms } from '@/api/common.js';
+import verify from "@/views/my-components/verify";
+export default {
+  name: 'ForgetPassword',
+  components: { verify },
+  data () {
+    return {
+      config:require('@/config'),
+      loading: false, // 加载状态
+      loading1: false, // 第二步加载状态
+      formFirst: { // 手机验证码表单
+        // 注册表单
+        mobile: '',
+        code: ''
+      },
+      form: { // 密码
+        password: '',
+        oncePasd: ''
+      },
+      year: new Date().getFullYear(), // 当前年份
+      step: 0, // 步骤
+      ruleInline: {
+        // 验证规则
+        mobile: [
+          { required: true, message: '请输入手机号码' },
+          {
+            pattern: RegExp.mobile,
+            trigger: 'blur',
+            message: '请输入正确的手机号'
+          }
+        ],
+        code: [{ required: true, message: '请输入手机验证码' }],
+        password: [{required: true, message: '密码不能为空'}, {pattern: RegExp.password, message: '密码不能少于6位'}]
+      },
+      verifyStatus: false, // 图片验证状态
+      verifyType: 'FIND_USER', // 图片验证类型
+      codeMsg: '发送验证码', // 验证码文字
+      interval: '', // 定时器
+      time: 60 // 倒计时时间
+    };
+  },
+  methods: {
+    // 提交短信验证码，修改密码
+    next () {
+      this.$refs.formFirst.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          let data = JSON.parse(JSON.stringify(this.formFirst));
+          apiLogin.validateCode(data).then((res) => {
+            this.loading = false;
+            if (res.success) {
+            //   this.$Message.success('');
+              this.step = 1;
+            } else {
+              this.$Message.warning(res.message);
+            }
+          }).catch(() => { this.loading = false; });
+        } else {}
+      });
+    },
+    handleSubmit () { // 提交密码
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let params = JSON.parse(JSON.stringify(this.form));
+          if (params.password !== params.oncePasd) {
+            this.$Message.warning('两次输入密码不一致');
+            return;
+          };
+          params.mobile = this.formFirst.mobile;
+          params.password = this.md5(params.password);
+          delete params.oncePasd;
+          this.loading1 = true;
+
+          apiLogin.forgetAndModify(params).then(res => {
+            this.loading1 = false;
+            console.log(res);
+            if (res.success) {
+              this.$Message.success('修改密码成功');
+              this.$router.push('login');
+            }
+          }).catch(() => { this.loading = false; });
+        };
+      });
+    },
+    sendCode () { // 发送验证码
+      if (this.time === 60) {
+        if (this.formFirst.mobile === '') {
+          this.$Message.warning('请先填写手机号');
+          return;
+        }
+        if (!this.verifyStatus) {
+          this.$Message.warning('请先完成安全验证');
+          return;
+        }
+        let params = {
+          mobile: this.formFirst.mobile,
+          verificationEnums: 'FIND_USER'
+        };
+        sendSms(params).then(res => {
+          if (res.success) {
+            this.$Message.success('验证码发送成功');
+            let that = this;
+            this.interval = setInterval(() => {
+              that.time--;
+              if (that.time === 0) {
+                that.time = 60;
+                that.codeMsg = '重新发送';
+                that.verifyStatus = false;
+                clearInterval(that.interval);
+              } else {
+                that.codeMsg = that.time;
+              }
+            }, 1000);
+          } else {
+            this.$Message.warning(res.message);
+          }
+        });
+      }
+    },
+    verifyChange (con) { // 验证通过
+      if (!con.status) return;
+      this.$refs.verify.show = false;
+      this.verifyStatus = true;
+    },
+    verifyBtnClick () {
+      if (!this.verifyStatus) {
+        this.$refs.verify.init();
+      }
+    }
+  },
+  mounted () {
+    document.querySelector('.forget-password').style.height = window.innerHeight + 'px'
+    this.$refs.formFirst.resetFields();
+  },
+  watch: {
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.forget-password{
+  min-height: 700px;
+}
+.logo-box {
+  width: 600px;
+  height: 80px;
+  margin: 0 auto;
+  display: flex;
+  align-items: center;
+  img {
+    width: 150px;
+    cursor: pointer;
+  }
+  div {
+    font-size: 20px;
+    margin-top: 10px;
+  }
+}
+
+.login-container {
+  border-top: 2px solid $theme_color;
+  position: relative;
+  margin: 0 auto;
+  width: 600px;
+  background-color: #fff;
+  padding: 20px 150px;
+  .login-btn{
+    position: absolute;
+    right: 20px;
+    top: -45px;
+  }
+}
+
+.verify-con{
+  position: absolute;
+  left: 140px;
+  top: -30px;
+  z-index: 10;
+}
+
+.other-login {
+  margin: 0 auto;
+  .ivu-icon {
+    font-size: 24px;
+  }
+}
+.regist {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: -10px;
+  span {
+    margin-left: 10px;
+    &:hover {
+      cursor: pointer;
+      color: $theme_color;
+    }
+  }
+}
+.foot {
+  position: fixed;
+  bottom: 4vh;
+  width: 368px;
+  left: calc(50% - 184px);
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
+  .help {
+    margin: 0 auto;
+    margin-bottom: 1vh;
+    width: 60%;
+    .item {
+      color: rgba(0, 0, 0, 0.45);
+    }
+    :hover {
+      color: rgba(0, 0, 0, 0.65);
+    }
+  }
+}
+</style>

seller/src/views/login.vue

@@ -2,59 +2,58 @@
   <div class="login" @click="$refs.verify.show = false">
     <Row type="flex" @keydown.enter.native="submitLogin">
       <Col style="width: 368px">
-        <Header />
+      <Header />
-        <Row style="flex-direction: column">
+      <Row style="flex-direction: column">
-          <Form
+        <Tabs v-model="loginType">
-            ref="usernameLoginForm"
+          <Tab-pane label="账号密码登录" name="passwordLogin">
-            :model="form"
+            <!--账号密码登录-->
-            :rules="rules"
+            <Form ref="usernameLoginForm" :model="form" :rules="rules" class="form">
-            class="form"
+              <FormItem prop="username">
-          >
+                <Input v-model="form.username" prefix="ios-contact" size="large" clearable placeholder="请输入用户名"
-            <FormItem prop="username">
+                  autocomplete="off" />
-              <Input
+              </FormItem>
-                v-model="form.username"
+              <FormItem prop="password">
-                prefix="ios-contact"
+                <Input type="password" v-model="form.password" prefix="ios-lock" size="large" password placeholder="请输入密码"
-                size="large"
+                  autocomplete="off" />
-                clearable
+              </FormItem>
-                placeholder="请输入用户名"
+            </Form>
-                autocomplete="off"
+            <div class="register">
-              />
+              <a @click="$router.push('forgetPassword')">忘记密码</a>
-            </FormItem>
-            <FormItem prop="password">
-              <Input
-                type="password"
-                v-model="form.password"
-                prefix="ios-lock"
-                size="large"
-                password
-                placeholder="请输入密码"
-                autocomplete="off"
-              />
-            </FormItem>
-          </Form>
-
-          <Row>
-            <div
-              class="login-btn"
-              type="primary"
-              size="large"
-              :loading="loading"
-              @click="submitLogin"
-              long
-            >
-              <span v-if="!loading">登录</span>
-              <span v-else>登录中</span>
             </div>
-          </Row>
+          </Tab-pane>
+          <Tab-pane label="验证码登录" name="mobileLogin">
+            <!-- 验证码登录 -->
+            <Form ref="formSms" :model="formSms" :rules="ruleInline" @click.self='$refs.verify.show = false'>
+              <FormItem prop="mobile">
+                <i-input type="text" v-model="formSms.mobile" clearable placeholder="手机号">
+                  <Icon type="md-lock" slot="prepend"></Icon>
+                </i-input>
+              </FormItem>
+              <FormItem prop="code">
+                <i-input type="text" v-model="formSms.code" placeholder="手机验证码">
+                  <Icon type="ios-text-outline" style="font-weight: bold" slot="prepend" />
+                  <Button slot="append" @click="sendCode">{{ codeMsg }}</Button>
+                </i-input>
+              </FormItem>
+              <FormItem>
+                <Button @click.stop="verifyBtnClick" long :type="verifyStatus ? 'success' : 'default'">{{ verifyStatus ?
+                  '验证通过' :
+                  '点击完成安全验证' }}
+                </Button>
+              </FormItem>
+            </Form>
+          </Tab-pane>
+        </Tabs>
+        <Row>
+          <div class="login-btn" type="primary" size="large" :loading="loading" @click="submitLogin" long>
+            <span v-if="!loading">登录</span>
+            <span v-else>登录中</span>
+          </div>
         </Row>
-        <Footer />
+      </Row>
-        <!-- 拼图验证码 -->
+      <Footer />
-        <verify
+      <!-- 拼图验证码 -->
-          ref="verify"
+      <verify ref="verify" class="verify-con" verifyType="LOGIN" @change="verifyChange"></verify>
-          class="verify-con"
-          verifyType="LOGIN"
-          @change="verifyChange"
-        ></verify>
       </Col>
     </Row>
   </div>
@@ -62,7 +61,8 @@
 
 <script>
 import { getCurrentPermissionList } from "@/api/index";
-import { login, userMsg } from "@/api/index";
+import { login, userMsg, storeSmsLogin } from "@/api/index";
+import { sendSms } from "@/api/common.js";
 import Cookies from "js-cookie";
 import Header from "@/views/main-components/header";
 import Footer from "@/views/main-components/footer";
@@ -78,6 +78,9 @@ export default {
     return {
       saveLogin: true, // 保存登录状态
       loading: false, // 加载状态
+      verifyStatus: false, // 是否图片验证通过
+      time: 60, // 倒计时
+      loginType: 'passwordLogin', //登陆类型
       form: {
         // 表单数据
         username: "",
@@ -85,6 +88,10 @@ export default {
         mobile: "",
         code: "",
       },
+      formSms: {
+        mobile: '',
+        code: '',
+      },
       rules: {
         // 验证规则
         username: [
@@ -102,6 +109,23 @@ export default {
           },
         ],
       },
+      ruleInline: {
+        // 验证规则
+        username: [{ required: true, message: "请输入用户名" }],
+        password: [
+          { required: true, message: "请输入密码" },
+          { type: "string", min: 6, message: "密码不能少于6位" },
+        ],
+        mobile: [
+          { required: true, message: "请输入手机号码" },
+          {
+            pattern: RegExp.mobile,
+            message: "请输入正确的手机号",
+          },
+        ],
+        code: [{ required: true, message: "请输入手机验证码" }],
+      },
+      codeMsg: "发送验证码", // 验证码文字
     };
   },
   created() {
@@ -142,35 +166,92 @@ export default {
         }
       });
     },
+    // 发送手机验证码
+    sendCode() {
+      if (this.time === 60) {
+        if (this.formSms.mobile === "") {
+          this.$Message.warning("请先填写手机号");
+          return;
+        }
+        if (!this.verifyStatus) {
+          this.$Message.warning("请先完成安全验证");
+          return;
+        }
+        let params = {
+          mobile: this.formSms.mobile,
+          verificationEnums: "LOGIN",
+        };
+        sendSms(params).then((res) => {
+          if (res.success) {
+            this.$Message.success("验证码发送成功");
+            let that = this;
+            this.interval = setInterval(() => {
+              that.time--;
+              if (that.time === 0) {
+                that.time = 60;
+                that.codeMsg = "重新发送";
+                that.verifyStatus = false;
+                clearInterval(that.interval);
+              } else {
+                that.codeMsg = that.time;
+              }
+            }, 1000);
+          } else {
+            this.$Message.warning(res.message);
+          }
+        });
+      }
+    },
     submitLogin() {
       // 登录提交
-      this.$refs.usernameLoginForm.validate((valid) => {
+      if (this.loginType == 'passwordLogin') {
-        if (valid) {
+        this.$refs.usernameLoginForm.validate((valid) => {
-          this.$refs.verify.init();
+          if (valid) {
-        }
+            this.$refs.verify.init();
-      });
+          }
+        });
+      } else if (this.loginType == 'mobileLogin') {
+        this.$refs['formSms'].validate((valid) => {
+          if (valid) {
+            storeSmsLogin(this.formSms).then(res => {
+              if (res.success) {
+                this.afterLogin(res)
+              }
+            })
+          }
+        })
+      }
     },
     verifyChange(con) {
       // 拼图验证码回显
       if (!con.status) return;
 
-      this.loading = true;
+      if (this.loginType == 'passwordLogin') {
-
+        this.loading = true;
-      let fd = new FormData();
+        let fd = new FormData();
-      fd.append("username", this.form.username);
+        fd.append("username", this.form.username);
-      fd.append("password", this.md5(this.form.password));
+        fd.append("password", this.md5(this.form.password));
-      login(fd)
+        login(fd)
-        .then((res) => {
+          .then((res) => {
-          this.loading = false;
+            this.loading = false;
-          if (res && res.success) {
+            if (res && res.success) {
-            this.afterLogin(res);
+              this.afterLogin(res);
-          }
+            }
-        })
+          })
-        .catch(() => {
+          .catch(() => {
-          this.loading = false;
+            this.loading = false;
-        });
+          });
+      }
+      this.verifyStatus = true;
       this.$refs.verify.show = false;
     },
+
+    // 开启滑块验证
+    verifyBtnClick() {
+      if (!this.verifyStatus) {
+        this.$refs.verify.init();
+      }
+    },
   },
 };
 </script>
@@ -184,12 +265,14 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+
   .verify-con {
     position: absolute;
     top: 126px;
     z-index: 10;
     left: 20px;
   }
+
   .form {
     padding-top: 1vh;
   }
@@ -208,9 +291,11 @@ export default {
     text-align: center;
     transition: 0.35s;
   }
+
   .login-btn:hover {
     opacity: 0.9;
     border-radius: 10px;
   }
+  
 }
 </style>

seller/src/views/shop/ship/logistics.vue

@@ -139,7 +139,7 @@ export default {
           minWidth: 120,
           sortable: true,
           render: (h, params) => {
-            if (params.row.selected === null || params.row.selected === "") {
+            if (!params.row.selected) {
               return h("div", [h("tag", {props: {color: "volcano"}}, "关闭")]);
             } else {
               return h("div", [h("tag", {props: {color: "green"}}, "开启")]);
@@ -152,7 +152,7 @@ export default {
           align: "center",
           width: 200,
           render: (h, params) => {
-            if (params.row.selected === null) {
+            if (!params.row.selected) {
               return h("div", [
                 h(
                   "Button",
@@ -301,7 +301,7 @@ export default {
     },
 
     submit() {
-      if ( this.row.selected === null ||  this.row.selected === "") {
+      if ( !this.row.selected) {
         API_Shop.logisticsChecked(
           this.row.logisticsId,
           this.faceSheetForm
@@ -329,7 +329,7 @@ export default {
         content: "您确认关闭此物流公司?",
         loading: true,
         onOk: () => {
-          API_Shop.logisticsUnChecked(v.selected).then((res) => {
+          API_Shop.logisticsUnChecked(v.logisticsId).then((res) => {
             this.$Modal.remove();
             if (res.success) {
               this.$Message.success("物流公司关闭成功");