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

buyer/.npmrc

@@ -1,5 +1,4 @@
-# 默认依赖包指定淘宝源
+registry "https://registry.npmmirror.com"
-registry=https://registry.npm.taobao.org/
+sass_binary_site "https://npmmirror.com/mirrors/node-sass"
-sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+phantomjs_cdnurl "https://npmmirror.com/mirrors/phantomjs"
-phantomjs_cdnurl=https://npm.taobao.org/mirrors/phantomjs/
+electron_mirror "https://npmmirror.com/mirrors/electron"
-electron_mirror=https://npm.taobao.org/mirrors/electron/

buyer/yarn.lock

@@ -900,6 +900,15 @@ aws4@^1.2.1, aws4@^1.8.0:
   resolved "https://registry.nlark.com/aws4/download/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=
 
+axios@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.npmmirror.com/axios/-/axios-1.2.3.tgz#31a3d824c0ebf754a004b585e5f04a5f87e6c4ff"
+  integrity sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 axios@^0.19.2:
   version "0.19.2"
   resolved "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"
@@ -912,6 +921,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+balloon-css@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/balloon-css/-/balloon-css-1.2.0.tgz#53d3fb4051264a278a58713bed6865845dbcaf4b"
+  integrity sha512-urXwkHgwp6GsXVF+it01485Z2Cj4pnW02ICnM0TemOlkKmCNnDLmyy+ZZiRXBpwldUXO+aRNr7Hdia4CBvXJ5A==
+
 base64-js@^1.0.2:
   version "1.5.1"
   resolved "https://registry.npm.taobao.org/base64-js/download/base64-js-1.5.1.tgz"
@@ -1671,10 +1685,10 @@ colorette@^1.2.2:
   resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.8"
-  resolved "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -2456,6 +2470,15 @@ dotenv@^8.2.0:
   resolved "https://registry.nlark.com/dotenv/download/dotenv-8.6.0.tgz?cache=0&sync_timestamp=1621628681571&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdotenv%2Fdownload%2Fdotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha1-Bhr2ZNGff02PxuT/m1hM4jety4s=
 
+dplayer@^1.27.1:
+  version "1.27.1"
+  resolved "https://registry.npmmirror.com/dplayer/-/dplayer-1.27.1.tgz#2d7bb67b515b29a68edaec906a2904acd277dfd4"
+  integrity sha512-2laBMXs5V1B9zPwJ7eAIw/OBo+Xjvy03i4GHTk3Cg+IWbrq8rKMFO0fFr6ClAYotYOCcFGOvaJDkOZcgKllsCA==
+  dependencies:
+    axios "1.2.3"
+    balloon-css "^1.0.3"
+    promise-polyfill "8.3.0"
+
 duplexer@^0.1.1:
   version "0.1.2"
   resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz"
@@ -3001,6 +3024,11 @@ follow-redirects@1.5.10, follow-redirects@^1.0.0:
   dependencies:
     debug "=3.1.0"
 
+follow-redirects@^1.15.0:
+  version "1.15.5"
+  resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.npm.taobao.org/for-in/download/for-in-0.1.8.tgz"
@@ -3023,6 +3051,15 @@ forever-agent@~0.6.1:
   resolved "https://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.1.1:
   version "2.1.4"
   resolved "https://registry.nlark.com/form-data/download/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
@@ -6118,6 +6155,11 @@ promise-inflight@^1.0.1:
   resolved "https://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+promise-polyfill@8.3.0:
+  version "8.3.0"
+  resolved "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-8.3.0.tgz#9284810268138d103807b11f4e23d5e945a4db63"
+  integrity sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==
+
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.npm.taobao.org/promise/download/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -6133,6 +6175,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/prr/download/prr-1.0.1.tgz"

manager/.npmrc

@@ -1,5 +1,4 @@
-# 默认依赖包指定淘宝源
+registry "https://registry.npmmirror.com"
-registry=https://registry.npm.taobao.org/
+sass_binary_site "https://npmmirror.com/mirrors/node-sass"
-sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+phantomjs_cdnurl "https://npmmirror.com/mirrors/phantomjs"
-phantomjs_cdnurl=https://npm.taobao.org/mirrors/phantomjs/
+electron_mirror "https://npmmirror.com/mirrors/electron"
-electron_mirror=https://npm.taobao.org/mirrors/electron/

manager/src/views/distribution/distribution.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Card>
-      <Row @keydown.enter.native="handleSearch">
+      <Row @keydown.enter.native.prevent="handleSearch">
         <Form
           ref="searchForm"
           :model="searchForm"
@@ -68,10 +68,9 @@
 
 <script>
 import {
-  getDistributionListData,
+getDistributionListData,
-  retreatDistribution,
+resumeDistribution,
-  resumeDistribution,
+retreatDistribution
-  auditDistribution,
 } from "@/api/distribution";
 import { distributionStatusList } from "./dataJson.js";
 export default {

manager/src/views/distribution/distributionApply.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Card>
-      <Row @keydown.enter.native="handleSearch">
+      <Row @keydown.enter.native.prevent="handleSearch">
         <Form
           ref="searchForm"
           :model="searchForm"
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import { getDistributionListData, auditDistribution } from "@/api/distribution";
+import { auditDistribution, getDistributionListData } from "@/api/distribution";
 
 export default {
   name: "distributionApply",

manager/src/views/distribution/distributionCash.vue

@@ -1,15 +1,15 @@
 <template>
   <div>
     <Card>
-        <Form ref="searchForm" :model="searchForm"  class="search-form">
+        <Form ref="searchForm" @keydown.enter.native.prevent="handleSearch" :model="searchForm"  class="search-form">
           <Form-item label="会员名称"  class="flex" prop="memberName">
             <Input
-              type="text" v-model="searchForm.memberName" clearable
+              type="text" placeholder="请输入会员名称" v-model="searchForm.memberName" clearable
               style="width: 200px"></Input>
           </Form-item>
           <Form-item label="编号" class="flex">
             <Input
-              type="text" v-model="searchForm.sn" clearable
+              type="text" placeholder="请输入编号" v-model="searchForm.sn" clearable
               style="width: 200px"></Input>
           </Form-item>
           <Form-item label="状态"
@@ -55,10 +55,10 @@
 
 <script>
 import {
-        getDistributionCash,
+auditDistributionCash,
-        auditDistributionCash
+getDistributionCash
-    } from "@/api/distribution";
+} from "@/api/distribution";
-import {cashStatusList} from './dataJson'
+import { cashStatusList } from './dataJson';
 export default {
   name: "distributionCash",
   data() {

manager/src/views/distribution/distributionGoods.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Card>
-      <Form @keydown.enter.native="handleSearch" ref="searchForm" :model="searchForm" inline :label-width="70"
+      <Form @keydown.enter.native.prevent="handleSearch" ref="searchForm" :model="searchForm" inline :label-width="70"
         class="search-form">
         <Form-item label="商品名称" prop="goodsName">
           <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getDistributionGoods, delDistributionGoods } from "@/api/distribution";
+import { delDistributionGoods, getDistributionGoods } from "@/api/distribution";
 import vueQr from "vue-qr";
 export default {
   components: {

seller/.npmrc

@@ -1,5 +1,4 @@
-# 默认依赖包指定淘宝源
+registry "https://registry.npmmirror.com"
-registry=https://registry.npm.taobao.org/
+sass_binary_site "https://npmmirror.com/mirrors/node-sass"
-sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+phantomjs_cdnurl "https://npmmirror.com/mirrors/phantomjs"
-phantomjs_cdnurl=https://npm.taobao.org/mirrors/phantomjs/
+electron_mirror "https://npmmirror.com/mirrors/electron"
-electron_mirror=https://npm.taobao.org/mirrors/electron/

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

@@ -208,7 +208,7 @@
                                                 :filter-method="filterMethod"
                                                 :maxlength="30" placeholder="请输入规格值" style="width: 180px"
                                                 @on-focus="changeSkuVals(val, item.name)"
-                                                @on-blur="checkSkuVal(val, index)"
+                                                @on-blur="checkSkuVal(val, $index, item)"
                                                 @on-change="skuValueChange(val, index, item)">
                                   </AutoComplete>
                                   <a style="margin-left: 6px" v-if="val.value && val.value !== ''">
@@ -691,6 +691,7 @@ export default {
       picModalFlag: false, // 图片选择器
       selectedFormBtnName: "", // 点击图片绑定form
       selectedImage: [],
+      lastEditSkuValue: '',
     };
   },
   watch: {
@@ -1326,7 +1327,6 @@ export default {
         return;
       }
       if (val.value === '') {
-        this.$Message.error("规格值不能为空！");
         return;
       }
       if (this.zz(0, val.value) > 20) {
@@ -1336,6 +1336,7 @@ export default {
         this.$forceUpdate();// 调用该方法会触发组件的重新渲染
         // return;
       }
+      this.lastEditSkuValue = val.value;
       let curVal = this.currentSkuVal;
       this.skuTableData = this.skuTableData.map((e) => {
         if (e[val.name] === curVal) {
@@ -1362,6 +1363,10 @@ export default {
     checkSkuVal(val) {
       if (val.value === "") {
         this.$Message.error("规格值不能为空！");
+        this.skuInfo[skuIndex] && (this.skuInfo[skuIndex].spec_values = this.skuInfo[skuIndex].spec_values.filter((i) => i.value !== ""));
+        this.skuTableData = this.skuTableData.filter(
+          (e) => e[spec.name] !== this.lastEditSkuValue
+        );
       }
     },
     /** 移除当前规格项 进行数据变化*/

seller/src/views/login.vue

@@ -1,4 +1,4 @@
- <template>
+<template>
   <div class="login" @click="$refs.verify.show = false">
     <Row type="flex" @keydown.enter.native="submitLogin">
       <Col style="width: 368px">
@@ -9,12 +9,12 @@
             <!--账号密码登录-->
             <Form ref="usernameLoginForm" :model="form" :rules="rules" class="form">
               <FormItem prop="username">
-                <Input v-model="form.username" prefix="ios-contact" size="large" clearable placeholder="请输入用户名"
+                <Input v-model="form.username" prefix="ios-contact" clearable placeholder="请输入用户名"
                   autocomplete="off" />
               </FormItem>
               <FormItem prop="password">
-                <Input type="password" v-model="form.password" prefix="ios-lock" size="large" password placeholder="请输入密码"
+                <Input type="password" v-model="form.password" prefix="ios-lock" password
-                  autocomplete="off" />
+                  placeholder="请输入密码" autocomplete="off" />
               </FormItem>
             </Form>
             <div class="register">
@@ -25,21 +25,21 @@
             <!-- 验证码登录 -->
             <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="手机号">
+                <i-input type="text" maxlength="11" 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>
+                  <Button slot="append" @click="sendCode" :loading="sendCodeLoading">{{ codeMsg }}</Button>
                 </i-input>
               </FormItem>
               <FormItem>
-                <Button @click.stop="verifyBtnClick" long :type="verifyStatus ? 'success' : 'default'">{{ verifyStatus ?
+                <!-- <Button @click.stop="verifyBtnClick" long :type="verifyStatus ? 'success' : 'default'">{{ verifyStatus ?
                   '验证通过' :
                   '点击完成安全验证' }}
-                </Button>
+                </Button> -->
               </FormItem>
             </Form>
           </Tab-pane>
@@ -60,14 +60,13 @@
 </template>
 
 <script>
-import { getCurrentPermissionList } from "@/api/index";
-import { login, userMsg, storeSmsLogin } from "@/api/index";
 import { sendSms } from "@/api/common.js";
-import Cookies from "js-cookie";
+import { login, storeSmsLogin, userMsg } from "@/api/index";
-import Header from "@/views/main-components/header";
-import Footer from "@/views/main-components/footer";
 import util from "@/libs/util.js";
+import Footer from "@/views/main-components/footer";
+import Header from "@/views/main-components/header";
 import verify from "@/views/my-components/verify";
+import Cookies from "js-cookie";
 export default {
   components: {
     Header,
@@ -77,6 +76,7 @@ export default {
   data() {
     return {
       saveLogin: true, // 保存登录状态
+      sendCodeLoading:false,
       loading: false, // 加载状态
       verifyStatus: false, // 是否图片验证通过
       time: 60, // 倒计时
@@ -171,26 +171,30 @@ export default {
     },
     // 发送手机验证码
     sendCode() {
-      if (this.time === 60) {
       if (this.formSms.mobile === "") {
         this.$Message.warning("请先填写手机号");
         return;
       }
       if (!this.verifyStatus) {
-          this.$Message.warning("请先完成安全验证");
+        this.$refs.verify.init();
-          return;
+        return
       }
+      if (this.time === 60) {
+        this.sendCodeLoading = true
         let params = {
           mobile: this.formSms.mobile,
           verificationEnums: "LOGIN",
         };
         sendSms(params).then((res) => {
+
           if (res.success) {
             this.$Message.success("验证码发送成功");
             let that = this;
             this.interval = setInterval(() => {
+              // this.sendCodeLoading = false
               that.time--;
               if (that.time === 0) {
+                this.sendCodeLoading = false
                 that.time = 60;
                 that.codeMsg = "重新发送";
                 that.verifyStatus = false;
@@ -202,6 +206,8 @@ export default {
           } else {
             this.$Message.warning(res.message);
           }
+        }).catch(() => {
+          this.sendCodeLoading = false
         });
       }
     },
@@ -216,10 +222,16 @@ export default {
       } else if (this.loginType == 'mobileLogin') {
         this.$refs['formSms'].validate((valid) => {
           if (valid) {
+            this.loading = true;
+
             storeSmsLogin(this.formSms).then(res => {
+              this.loading = false;
+
               if (res.success) {
                 this.afterLogin(res)
               }
+            }).catch(() => {
+              this.loading = false;
             })
           }
         })
@@ -244,8 +256,12 @@ export default {
           .catch(() => {
             this.loading = false;
           });
-      }
+      } else {
         this.verifyStatus = true;
+
+        this.sendCode()
+      }
+
       this.$refs.verify.show = false;
     },