文件名大小写修改

buyer/src/pages/CouponCenter.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="coupon-center">
+    <BaseHeader></BaseHeader>
+    <div class="content">
+      <div>
+        <div class="coupon-title">
+          <router-link to="/">
+            <img src="../assets/images/logo.png" width="120" alt="">
+          </router-link>
+          <p>领券中心</p>
+          <Input search style="width:400px" @on-search='search' enter-button="搜索" placeholder="搜索优惠券" />
+        </div>
+
+        <div class="fontsize_18 recommend">推荐好券</div>
+
+        <empty v-if="list.length===0" />
+        <ul class="coupon-list" v-else>
+          <li v-for="(item, index) in list" class="coupon-item" :key="index">
+            <div class="c-left">
+              <div>
+                <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
+                <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
+                <span class="describe">满{{item.consumeThreshold}}元可用</span>
+              </div>
+              <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
+              <p>有效期：{{item.endTime}}</p>
+            </div>
+            <b></b>
+            <a class="c-right" @click="receive(item)">立即领取</a>
+            <i class="circle-top"></i>
+            <i class="circle-bottom"></i>
+          </li>
+        </ul>
+        <Page :total="total" @on-change="changePageNum"
+          class="pageration"
+          @on-page-size-change="changePageSize"
+          :page-size="params.pageSize"
+          show-total
+          show-sizer>
+        </Page>
+      </div>
+    </div>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+<script>
+import {couponList, receiveCoupon} from '@/api/member.js'
+export default {
+  data () {
+    return {
+      list: [], // 优惠券列表
+      total: 0, // 优惠券总数
+      params: { // 请求参数
+        pageNumber: 1,
+        pageSize: 20
+      }
+    }
+  },
+  methods: {
+    // 搜索优惠券
+    search (item) {
+      this.params.couponName = item
+      this.params.pageNumber = 1
+      this.getList()
+    },
+    // 获取优惠券列表
+    getList () {
+      this.$Spin.show()
+      couponList(this.params).then(res => {
+        this.$Spin.hide()
+        this.loading = false
+        if (res.success) {
+          this.list = res.result.records
+          this.total = res.result.total
+        }
+      }).catch(() => { this.$Spin.hide() })
+    },
+    // 分页 改变页码
+    changePageNum (val) {
+      this.params.pageNumber = val;
+      this.getList()
+    },
+    // 分页 改变每页数
+    changePageSize (val) {
+      this.params.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+    // 领取优惠券
+    receive (item) {
+      receiveCoupon(item.id).then(res => {
+        if (res.success) {
+          this.$Modal.confirm({
+            title: '领取优惠券',
+            content: '<p>优惠券领取成功，可到我的优惠券页面查看</p>',
+            okText: '我的优惠券',
+            cancelText: '立即使用',
+            onOk: () => {
+              this.$router.push('/home/Coupons')
+            },
+            onCancel: () => {
+              if (item.storeId !== 'platform') {
+                this.$router.push({path: '/merchant', query: {id: item.storeId}})
+              } else {
+                if (item.scopeType === 'PORTION_GOODS_CATEGORY') {
+                  this.$router.push({path: '/goodsList', query: {categoryId: item.scopeId}})
+                } else {
+                  this.$router.push({path: '/goodsList'})
+                }
+              }
+            }
+          });
+        }
+      })
+    },
+    // 优惠券可用范围
+    useScope (type, storeName) {
+      let shop = '平台';
+      let goods = '全部商品'
+      if (storeName !== 'platform') shop = storeName
+      switch (type) {
+        case 'ALL':
+          goods = '全部商品'
+          break;
+        case 'PORTION_GOODS':
+          goods = '部分商品'
+          break;
+        case 'PORTION_GOODS_CATEGORY':
+          goods = '部分分类商品'
+          break;
+      }
+      return `${shop}${goods}可用`
+    }
+  },
+  mounted () {
+    this.getList()
+  }
+}
+</script>
+<style lang="scss" scoped>
+  @import '../assets/styles/coupon.scss';
+  .content{
+    width: 100%;
+    background-color: #fff;
+
+    > div {
+      margin: 10px auto;
+      width: 1200px;
+    }
+  }
+  .coupon-title {
+    display: flex;
+    align-items: center;
+
+    p{
+      font-size: 18px;
+      margin-right: 500px;
+    }
+    border-bottom: 2px solid $theme_color;
+  }
+  .recommend {
+    margin: 20px auto;
+    font-weight: bold;
+    width: 200px;
+    text-align: center;
+  }
+  .coupon-item {
+    b{
+      background: url('../assets/images/small-circle.png') top left repeat-y;
+    }
+  }
+  .pageration {
+    text-align: right;
+    padding-bottom: 10px;
+  }
+</style>

buyer/src/pages/ForgetPassword.vue

@@ -0,0 +1,330 @@
+<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"
+          >lili-shop</a
+        >
+        版权所有
+      </Row>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as RegExp from '@/plugins/RegExp.js';
+import { md5 } from '@/plugins/md5.js';
+import * as apiLogin from '@/api/login.js';
+import { sendSms } from '@/api/common.js';
+import Verify from '@/components/verify';
+export default {
+  name: 'ForgetPassword',
+  components: { Verify },
+  data () {
+    return {
+      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 = md5(params.password);
+          delete params.oncePasd;
+          this.loading1 = true;
+
+          apiLogin.resetPassword(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>

buyer/src/pages/Index.vue

@@ -21,7 +21,7 @@
 
 <script>
 import Search from '@/components/Search';
-import ModelForm from '@/components/indexDecorate/modelForm';
+import ModelForm from '@/components/indexDecorate/ModelForm';
 import HoverSearch from '@/components/header/hoverSearch';
 import storage from '@/plugins/storage';
 import { indexData } from '@/api/index.js';

buyer/src/pages/SignUp.vue

@@ -103,7 +103,7 @@ import * as apiLogin from '@/api/login.js';
 import { sendSms } from '@/api/common.js';
 import Verify from '@/components/verify';
 export default {
-  name: 'Login',
+  name: 'SignUp',
   components: { Verify },
   data () {
     return {

buyer/src/pages/forgetPassword.vue

@@ -114,7 +114,7 @@ import * as apiLogin from '@/api/login.js';
 import { sendSms } from '@/api/common.js';
 import Verify from '@/components/verify';
 export default {
-  name: 'Login',
+  name: 'ForgetPassword',
   components: { Verify },
   data () {
     return {

buyer/src/pages/payment/ThirdPay.vue

@@ -0,0 +1,154 @@
+<template>
+  <div class="wrapper">
+    <BaseHeader></BaseHeader>
+    <div class="wrapper-head">
+      <div class="head-left">
+        <div class="left-tips">订单提交成功，请尽快付款！</div>
+        <div class="left-tips-time">请您尽快完成支付，否则订单会被自动取消</div>
+      </div>
+      <div class="head-right">
+        <div>应付金额 <span class="price">{{$route.query.price | unitPrice}}</span>元</div>
+      </div>
+    </div>
+    <div class="content">
+      <div class="pay-way">{{params.paymentMethod === 'ALIPAY' ? '支付宝支付' : '微信支付'}}</div>
+      <div class="qrcode">
+        <div style="width:200px;height:200px;border:1px solid #eee;">
+          <vue-qr :text="qrcode" :margin="0" colorDark="#000" colorLight="#fff" :size="200"></vue-qr>
+        </div>
+        <div class="intro">
+          <Icon type="md-qr-scanner" /> 请使用{{params.paymentMethod === 'ALIPAY' ? '支付宝' : '微信'}}扫码付款
+        </div>
+      </div>
+      <div class="btn-div">
+        <p class="mb_10">支付成功后自动跳转，如未跳转请点击按钮手动跳转。。。</p>
+        <div>
+          <Button @click="handlePay">重新支付</Button>
+          <Button type="success" @click="$router.push('/payDone')">支付成功</Button>
+        </div>
+      </div>
+      <a @click="$router.back()">选择其他支付方式></a>
+    </div>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+<script>
+import vueQr from 'vue-qr';
+import { payCallback, pay } from '@/api/pay.js';
+export default {
+  components: { vueQr },
+  data () {
+    return {
+      qrcode: '', // 二维码
+      params: this.$route.query, // 参数
+      interval: null, // 定时器
+      num: 0 // 商品数
+    };
+  },
+  methods: {
+    // 获取支付二维码
+    handlePay () {
+      const params = this.$route.query;
+      pay(params).then(res => {
+        if (res.success) {
+          this.qrcode = res.result;
+          this.num = 0;
+          this.interval = setInterval(this.callback, 5000);
+        } else {
+          this.$Message.error(res.message)
+        }
+      });
+    },
+    callback () { // 支付回调接口
+      this.num++;
+      if (this.num >= 7) {
+        clearInterval(this.interval);
+        this.interval = null;
+      }
+      let params = JSON.parse(JSON.stringify(this.$route.query));
+      delete params.paymentMethod;
+      delete params.paymentClient;
+      payCallback(params).then(res => {
+        if (res.result) {
+          clearInterval(this.interval);
+          this.interval = null;
+          this.$router.push({path: '/payDone', query: {orderType: this.$route.query.orderType}});
+        }
+      });
+    }
+  },
+  mounted () {
+    this.handlePay();
+  }
+};
+</script>
+<style scoped lang="scss">
+.head-left {
+  font-weight: bold;
+}
+.left-tips {
+  font-size: 21px;
+}
+
+.left-tips-time {
+  font-size: 16px;
+}
+.wrapper-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  line-height: 1.75;
+}
+.wrapper-head,
+.content {
+  padding: 20px 40px;
+  width: 1000px;
+  margin: 20px auto;
+}
+.wrapper {
+  width: 100%;
+  height: 100%;
+}
+.content {
+  background-color: #fff;
+  box-shadow: 0 6px 10px #ddd;
+  position: relative;
+  display: flex;
+  .pay-way {
+    font-weight: bold;
+    font-size: 18px;
+  }
+
+  .qrcode {
+    margin: 30px 0 0 70px;
+  }
+
+  .intro {
+    background-color: #ff7674;
+    height: 40px;
+    line-height: 40px;
+    margin-top: 10px;
+    color: #fff;
+    font-size: 16px;
+    text-align: center;
+  }
+
+  .btn-div {
+    margin:120px 0 0 30px;
+  }
+
+  a {
+    position: absolute;
+    right: 20px;
+    top: 20px;
+  }
+}
+.price {
+  font-size: 18px;
+  font-weight: bold;
+  color: $theme_color;
+}
+.head-right {
+  font-weight: bold;
+}
+</style>

buyer/src/pages/shopEntry/ShopEntry.vue

@@ -39,9 +39,9 @@
 </template>
 <script>
 import { agreement, applyStatus } from '@/api/shopentry';
-import firstApply from './first-apply';
-import secondApply from './second-apply';
-import thirdApply from './third-apply';
+import firstApply from './FirstApply';
+import secondApply from './SecondApply';
+import thirdApply from './ThirdApply';
 export default {
   components: {
     firstApply,