diff --git a/package.json b/package.json
index f21f34a..8266f86 100644
--- a/package.json
+++ b/package.json
@@ -29,12 +29,13 @@
     "vue-content-loader": "^0.2.3",
     "vue-router": "^3.5.1",
     "vue-scrollto": "^2.20.0",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "weixin-js-sdk": "^1.6.5"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.5.11",
     "@vue/cli-plugin-eslint": "^4.5.11",
-    "@vue/cli-service": "^4.5.11",
+    "@vue/cli-service": "^4.5.19",
     "babel-eslint": "^10.1.0",
     "babel-plugin-import": "^1.13.3",
     "cross-env": "^7.0.3",
@@ -46,13 +47,14 @@
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.13.1",
     "less-loader": "^5.0.0",
-    "postcss-mobile-forever": "^0.0.1",
+    "postcss-px-to-viewport": "^1.1.1",
     "postcss-preset-env": "^6.7.0",
     "sass": "^1.32.10",
     "sass-loader": "^9.0.3",
     "svg-sprite-loader": "^4.2.1",
     "svgo": "^1.3.2",
-    "vue-template-compiler": "^2.6.12"
+    "vue-template-compiler": "^2.6.12",
+    "mini-css-extract-plugin": "2.5.3"
   },
   "browserslist": [
     "> 1%",
diff --git a/postcss.config.js b/postcss.config.js
index 4761f10..ed64934 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -2,16 +2,22 @@ module.exports = {
   plugins: {
     // https://github.com/csstools/postcss-preset-env
     'postcss-preset-env': {},
-    // https://github.com/wswmsword/postcss-mobile-forever
-    'postcss-mobile-forever': {
-      viewportWidth: file => /vant[\\/]/.test(file) ? 375 : 750,
-      maxDisplayWidth: 560,
+    // https://github.com/evrone/postcss-px-to-viewport/blob/master/README_CN.md
+    'postcss-px-to-viewport': {
+      unitToConvert: 'px',
+      viewportWidth: 750,
       unitPrecision: 3,
       propList: ['*'],
-      selectorBlackList: ['.ignore'],
-      rootContainingBlockSelectorList: ['van-popup--bottom'],
-      disableLandscape: true,
-      disableDesktop: true
+      viewportUnit: 'vw',
+      fontViewportUnit: 'vw',
+      selectorBlackList: ['.ignore', 'van'],
+      minPixelValue: 1,
+      mediaQuery: false,
+      replace: true,
+      exclude: [],
+      landscape: false,
+      landscapeUnit: 'vw',
+      landscapeWidth: 568
     }
   }
 }
diff --git a/src/api/login.js b/src/api/login.js
index a2e20c4..ba963c4 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -7,11 +7,11 @@ export function getCaptcha() {
   })
 }
 
-export function getMailCode(data) {
+export function getMobileCode(data) {
   return request({
-    url: '/sendEmailCode',
+    url: '/genMobileCode',
     method: 'post',
     data,
-    timeout: 20000
+    timeout: 5000
   })
 }
diff --git a/src/api/order.js b/src/api/order.js
index cb23acb..41b8f11 100644
--- a/src/api/order.js
+++ b/src/api/order.js
@@ -65,3 +65,26 @@ export function orderConfirm(orderId) {
   })
 }
 
+export function orderCoupon(data) {
+  return request({
+    url: `/coupon/list`,
+    method: 'get',
+    params: data
+  })
+}
+
+export function orderCouponMy(data) {
+  return request({
+    url: `/coupon/myList`,
+    method: 'get',
+    params: data
+  })
+}
+
+export function orderReceive(data) {
+  return request({
+    url: '/coupon/receive',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/components/GoodsItem/index.vue b/src/components/GoodsItem/index.vue
index 0ee4b1b..0fcc8f7 100644
--- a/src/components/GoodsItem/index.vue
+++ b/src/components/GoodsItem/index.vue
@@ -4,16 +4,19 @@
       <image-pic
         fill="cover"
         align="center"
-        width="180"
-        height="180"
+        width="150"
+        height="150"
         :src="img"
       />
     </div>
     <p class="title">{{ title }}</p>
     <!-- <p class="desc">{{ desc }}</p> -->
     <div class="num">
-      <span class="num__now">¥{{ price | yuan }}</span>
-      <span class="num__old">¥{{ discount | yuan }}</span>
+      <span class="num__now">¥</span>{{ price | yuan }}
+      <!-- <span class="num__old">¥{{ discount | yuan }}</span> -->
+    </div>
+    <div class="desc">
+      已售：{{ virtualSales || 0 }}
     </div>
     <!-- <div class="btn-wrapper">
       <van-button class="btn" size="small">立即购买</van-button>
@@ -24,7 +27,7 @@
 <script>
 export default {
   // eslint-disable-next-line vue/require-prop-types
-  props: ['goodsId', 'img', 'title', 'desc', 'price', 'discount'],
+  props: ['goodsId', 'img', 'title', 'desc', 'price', 'discount', 'virtualSales'],
   methods: {
     onNavigate() {
       this.$router.push({
@@ -42,17 +45,27 @@ export default {
   position: relative;
   width: 360px;
   overflow: hidden;
+  border-top:1px solid #ebedf0;
+  border-right: 1px solid #ebedf0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  &:nth-child(2n+2){
+    border-right:none;
+  }
   .pic {
     display: block;
     padding: 14px;
     // background: #f5f5f5;
   }
   .title {
-    padding: 14px;
+    margin-bottom: 10px;
+    height:66px;
+    max-width: 320px;
     font-size: $small;
     color: $black;
     text-align: center;
-    @include text-ellipsis;
+    @include text-multiple-ellipsis;
   }
   .desc {
     padding: 14px;
@@ -63,14 +76,16 @@ export default {
     @include text-ellipsis;
   }
   .num {
-    padding-bottom: 14px;
+    padding-bottom: 25px;
     text-align: center;
+    font-size: 36px;
+    color: $black;
+    font-weight: 500;
+    text-decoration-line: underline;
+    text-decoration-color: #969799;
     .num__now {
       font-family: DIN-Medium, DIN;
-      font-size: 34px;
-      font-weight: 500;
-      color: $red;
-      margin-right: 10px;
+      font-size: 24px;
     }
     .num__old {
       font-family: DIN-Medium, DIN;
diff --git a/src/components/ProductItem/index.vue b/src/components/ProductItem/index.vue
index 21dee63..3e6b8ab 100644
--- a/src/components/ProductItem/index.vue
+++ b/src/components/ProductItem/index.vue
@@ -17,10 +17,10 @@
             <van-tag v-if="isHot" type="danger">热品</van-tag>
             <van-tag type="success">7天可退</van-tag>
           </div>
-          <div class="sale">
+          <!-- <div class="sale">
             <span class="commom__num">评论2000+条</span>
             <span class="praise__rate">70%好评</span>
-          </div>
+          </div> -->
         </div>
         <div class="desc__bottom__btn">
           <van-button class="btn" size="mini" @click.stop="onAddCart">加入购物车</van-button>
@@ -74,7 +74,7 @@ export default {
     width: 510px;
     height: 240px;
     .desc__top {
-      margin-top: 10px;
+      margin-top: 30px;
       .desc__top__title {
         font-size: $small;
         color: $black;
diff --git a/src/components/Wx/index.js b/src/components/Wx/index.js
index f281106..e2b1013 100644
--- a/src/components/Wx/index.js
+++ b/src/components/Wx/index.js
@@ -19,11 +19,13 @@ export async function initWechatWebview() {
       jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData'] // 必填，需要使用的JS接口列表
     })
     wx.error(function(res) {
-      alert('wx error: ' + res)
+      // alert('wx error: ' + res)
       // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
     })
   } catch (e) {
     console.log(e)
+    return false
   }
+  return true
 }
 Vue.prototype.wxJsSdkInit = initWechatWebview
diff --git a/src/main.js b/src/main.js
index f07ff7a..1120440 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,6 +15,7 @@ import './permission'
 
 // import vant
 import '@/components/Vant'
+import '@/components/Wx'
 // import fontAwesome
 import '@/components/fontAwesome'
 // register common components globally
diff --git a/src/permission.js b/src/permission.js
index f7cc3d0..34ea159 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -4,7 +4,7 @@ import { Toast } from 'vant'
 import { getToken } from '@/utils/auth' // get token from cookie
 import { pathMatcher } from '@/utils/index'
 
-const whiteList = ['/login', '/registry', '/', '/index', '/category', '/detail/**', '/diamondGoodsList/**', '/search/**'] // 白名单
+const whiteList = ['/login', '/registry', '/', '/index', '/category', '/detail/**', '/diamondGoodsList/**', '/search/**', '/order/coupon'] // 白名单
 
 router.beforeEach(async(to, from, next) => {
   // 设置标题
@@ -39,6 +39,7 @@ router.beforeEach(async(to, from, next) => {
     }
   } else {
     if (pathMatcher(whiteList, to.path)) {
+      console.log(to.path)
       next()
     } else {
       // 反之则去登录页面
diff --git a/src/router/index.js b/src/router/index.js
index 091fd47..a44f322 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,7 +30,7 @@ const routes = [
   {
     path: '/registry',
     name: 'Registry',
-    component: () => import('@/views/auth/registry'),
+    component: () => import('@/views/auth/login'),
     meta: {
       title: '注册'
     }
@@ -262,6 +262,26 @@ const routes = [
     props: true,
     component: () => import('@/views/order/payStatus')
   },
+  // 优惠券
+  {
+    path: '/order/coupon',
+    name: 'coupon',
+    component: () => import('@/views/order/coupon'),
+    meta: {
+      title: '优惠券',
+      showTab: true
+    }
+  },
+  // 优惠券
+  {
+    path: '/order/my',
+    name: 'couponMy',
+    component: () => import('@/views/order/my'),
+    meta: {
+      title: '优惠券',
+      showTab: true
+    }
+  },
   // 评论页面
   {
     path: '/goodsComment/:orderGoodsId/:goodsId',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d643634..dddc9ac 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -22,9 +22,9 @@ const mutations = {
 const actions = {
   // 登录
   login({ commit }, userInfo) {
-    const { mobile, password } = userInfo
+    const { mobile, yzm } = userInfo
     return new Promise((resolve, reject) => {
-      login({ mobile, password })
+      login({ mobile, yzm })
         .then(res => {
           const { data } = res
           commit('SET_TOKEN', data)
diff --git a/src/utils/request.js b/src/utils/request.js
index d96ef5c..6202fe1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -53,6 +53,9 @@ service.interceptors.response.use(
       if (res.code === 5001) {
         return Promise.reject(new Error(res.msg || 'Error'))
       }
+      if (res.code === 50148) {
+        return res
+      }
       Toast.fail(res.msg)
       return Promise.reject(new Error(res.msg || 'Error'))
     } else {
diff --git a/src/views/auth/login.vue b/src/views/auth/login.vue
index 4adc1e1..cd94f1d 100644
--- a/src/views/auth/login.vue
+++ b/src/views/auth/login.vue
@@ -1,39 +1,47 @@
 <template>
   <div class="login-container">
-    <div class="header">
+    <!-- <div class="header">
       <img class="header__logo" src="@/assets/logo4.png" alt="logo">
-    </div>
+    </div> -->
 
     <van-form class="form" @submit="onSubmit">
+      <div class="title-big">Waynboot-mall官网商城</div>
+      <div class="title">若该手机号未注册，我们将自动为你注册</div>
       <van-field
         v-model="form.mobile"
         type="text"
-        required
         clearable
-        name="手机号码"
-        label="手机号码"
+        name=""
+        label=""
         placeholder="请输入手机号码"
         :rules="[
           {
             validator: checkPhone,
-            required: true
           },
         ]"
       />
 
       <van-field
-        v-model="form.password"
-        type="password"
-        required
+        v-model="form.yzm"
         center
         clearable
-        name="密码"
-        label="密码"
-        placeholder="请输入密码"
-        :rules="[{ required: true }]"
-      />
+        label=""
+        placeholder="请输入短信验证码"
+      >
+        <template #button>
+          <span @click.stop="getMobileCode">{{ btnText }}</span>
+          <!-- <van-button
+            size="small"
+            plain
+            type="info"
+            native-type="text"
+            :disabled="disabled"
+
+          >{{ btnText }}</van-button> -->
+        </template>
+      </van-field>
 
-      <div style="margin: 36px">
+      <div class="submitDiv">
         <van-button
           round
           block
@@ -41,34 +49,39 @@
           type="info"
           loading-text="登录中..."
           native-type="submit"
+          class="submitBtn"
         >登录</van-button>
 
-        <van-button
-          style="margin-top: 10px"
-          plain
-          round
-          block
-          type="info"
-          native-type="button"
-          to="/registry"
-        >注册</van-button>
       </div>
     </van-form>
+    <van-checkbox v-model="checked" checked-color="crimson">已阅读并同意《用户协议》《隐私协议》</van-checkbox>
   </div>
 </template>
 
 <script>
+import { getMobileCode } from '@/api/login'
+
 export default {
   name: 'Login',
   data() {
     return {
       form: {
-        username: '',
-        password: ''
+        mobile: '',
+        yzm: ''
       },
-      loading: false
+      loading: false,
+      disabled: false,
+      totalCount: 0,
+      checked: false,
+      isKeyboardOpen: false
     }
   },
+  computed: {
+    btnText() {
+      return this.totalCount !== 0 ? `${this.totalCount}秒后获取` : '获取验证码'
+    }
+
+  },
   watch: {
     $route: {
       handler(route) {
@@ -77,11 +90,44 @@ export default {
       immediate: true
     }
   },
+  mounted() {
+    window.addEventListener('resize', this.checkKeyboard)
+    this.checkKeyboard()
+  },
+  beforeDestroy() {
+    // 移除监听
+    window.removeEventListener('resize', this.checkKeyboard)
+  },
   methods: {
+    getMobileCode() {
+      if (this.disabled) return
+      const { mobile } = this.form
+      if (!mobile || !this.checkPhone(mobile)) {
+        this.$toast.fail('请先输入正确的手机号码')
+        return
+      }
+      this.disabled = true
+      this.totalCount = 60
+      this.interval = setInterval(() => {
+        this.totalCount--
+        if (this.totalCount === 0) {
+          clearInterval(this.interval)
+          this.disabled = false
+        }
+      }, 1000)
+      getMobileCode({ mobile }).then((res) => {
+        this.form.emailKey = res.map.key
+        this.$notify({
+          type: 'success',
+          message: '短信验证码已发送',
+          duration: 2000
+        })
+      })
+    },
     // 校检手机号
     checkPhone(num) {
       if (num === 123456789) return true
-      const reg = /^[1][3,4,5,7,8][0-9]{9}$/
+      const reg = /^[1][3,4,5,7,8,9][0-9]{9}$/
       if (reg.test(num)) {
         return true
       }
@@ -89,6 +135,10 @@ export default {
     },
     // 提交
     onSubmit() {
+      if (!this.checked) {
+        this.$toast.fail('请先勾选同意用户协议及隐私政策')
+        return
+      }
       this.loading = true
       this.$store
         .dispatch('user/login', this.form)
@@ -112,7 +162,12 @@ export default {
         .finally(() => {
           this.loading = false
         })
+    },
+    checkKeyboard() {
+      // 根据视口高度与设备屏幕高度比较来判断键盘是否弹出
+      this.isKeyboardOpen = window.innerHeight > document.documentElement.clientHeight
     }
+
   }
 }
 </script>
@@ -139,9 +194,47 @@ export default {
   }
 
   .form {
-    // background: red;
+    margin-top:200px;
     padding: 24px;
-    // margin-top: 50px;
+    .title-big{
+      font-size: 42px;
+      color: #000;
+      font-weight: normal;
+      padding: 0 20px 20px 20px;
+    }
+    .title {
+      color: #b6b6b6;
+      padding: 0 20px 40px 20px;
+    }
+    ::v-deep .van-cell{
+      border-bottom: 1px solid #b6b6b6;
+      line-height: 40px;
+    }
+    ::v-deep .van-cell:after{
+       display: none;
+    }
+  }
+  ::v-deep .van-checkbox{
+    position: absolute;
+    bottom: -40vh;
+    left: 50%;
+    transform: translateX(-50%);
+    width: max-content;
+
+    .van-checkbox__label{
+      color: #b6b6b6;
+    }
+  }
+
+  .submitDiv{
+    margin:15vw  auto 0;
+    width: max-content;
+  }
+  .submitBtn{
+    background-color: crimson;
+    border: none;
+    width:500px;
+    font-size: 30px;
   }
 }
 </style>
diff --git a/src/views/auth/registry.vue b/src/views/auth/registry.vue
deleted file mode 100644
index 33dd4d8..0000000
--- a/src/views/auth/registry.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-
-<template>
-  <div class="registration">
-    <nav-bar :title="$route.meta.title">
-      <van-icon :color="variables.black" size="18" />
-    </nav-bar>
-
-    <van-form
-      class="form"
-      validate-trigger="onSubmit"
-      :show-error="false"
-      @submit="onSubmit"
-    >
-      <van-field
-        v-model="form.mobile"
-        type="text"
-        required
-        clearable
-        name="手机号码"
-        label="手机号码"
-        placeholder="请输入手机号码"
-        :rules="[
-          {
-            validator: checkPhone,
-            required: true,
-            message: '请输入正确的手机号码!',
-          },
-        ]"
-      />
-
-      <van-field
-        v-model="form.password"
-        type="password"
-        required
-        clearable
-        name="设置密码"
-        label="设置密码"
-        placeholder="请设置密码"
-        :rules="[{ required: true, message: '请设置密码!' }]"
-      />
-
-      <van-field
-        v-model="form.confirmPassword"
-        type="password"
-        required
-        clearable
-        name="确认密码"
-        label="确认密码"
-        placeholder="请再次输入密码确认"
-        :rules="[{ required: true, message: '请再次输入密码确认!' }]"
-      />
-
-      <van-field
-        v-model="form.captchaCode"
-        type="text"
-        required
-        center
-        clearable
-        name="图形验证码"
-        maxlength="4"
-        label="图形验证码"
-        placeholder="请输入图形验证码"
-        :rules="[{ required: true, message: '请输入正确的图形验证码！' }]"
-      >
-        <template #button>
-          <div class="regist-code">
-            <img :src="captchaImg" @click="getCaptcha">
-          </div>
-        </template>
-      </van-field>
-
-      <div style="margin: 36px">
-        <van-button
-          round
-          block
-          :loading="loading"
-          type="info"
-          loading-text="登录中..."
-          native-type="submit"
-        >注册</van-button>
-      </div>
-    </van-form>
-  </div>
-</template>
-
-<script>
-import variables from '@/styles/variables.scss'
-import { getCaptcha } from '@/api/login'
-import { setRegistry } from '@/api/user'
-
-export default {
-  name: 'Regist',
-  data() {
-    return {
-      form: {
-        mobile: '',
-        password: '',
-        confirmPassword: '',
-        captchaCode: '',
-        captchaKey: ''
-      },
-      disabled: false,
-      totalCount: 0,
-      loading: false,
-      captchaImg: ''
-    }
-  },
-  computed: {
-    variables() {
-      return variables
-    },
-    btnText() {
-      return this.totalCount !== 0 ? `${this.totalCount}秒后获取` : '获取验证码'
-    }
-
-  },
-  mounted() {
-    this.getCaptcha()
-  },
-  methods: {
-    // 获取图形验证码
-    getCaptcha() {
-      getCaptcha().then((res) => {
-        this.captchaImg = res.data.image
-        this.form.captchaKey = res.data.key
-      })
-    },
-    // 校检手机号
-    checkPhone(num) {
-      if (num === 123456789) return true
-      const reg = /^[1][3,4,5,7,8,9][0-9]{9}$/
-      if (reg.test(num)) {
-        return true
-      }
-      return false
-    },
-    // 提交
-    onSubmit() {
-      const { password, confirmPassword } = this.form
-      if (password !== confirmPassword) {
-        this.$toast.fail('确认密码与设置的不一致')
-        return
-      }
-      this.loading = true
-      setRegistry(this.form)
-        .then((res) => {
-          this.$notify({
-            type: 'success',
-            message: '注册成功，请登录',
-            duration: 2000,
-            onOpened: () => {
-              this.$router.back()
-            }
-          })
-        })
-        .finally(() => {
-          this.loading = false
-        })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.form {
-  padding: 24px;
-}
-.regist-code {
-  height: 40px;
-  img {
-    vertical-align: middle;
-    position: relative;
-    top: -2.467vw;
-  }
-}
-</style>
diff --git a/src/views/cart/modules/Tabbar.vue b/src/views/cart/modules/Tabbar.vue
index ade1852..b0d037a 100644
--- a/src/views/cart/modules/Tabbar.vue
+++ b/src/views/cart/modules/Tabbar.vue
@@ -69,6 +69,6 @@ export default {
   box-shadow: var(--submit-bar-shadow);
 }
 .van-submit-bar {
-  bottom: 100px;
+  bottom: 50px;
 }
 </style>
diff --git a/src/views/category/index.vue b/src/views/category/index.vue
index 20e3416..5591baa 100644
--- a/src/views/category/index.vue
+++ b/src/views/category/index.vue
@@ -16,7 +16,7 @@
               <van-grid :column-num="3" :border="false">
                 <van-grid-item v-for="(single,idx) in subCategoryList" :key="idx" class="single" @click="onL2CateClick(single.id)">
                   <image-pic fit="contain" :src="single.icon" />
-                  <span>{{ single.text }}</span>
+                  <span class="textName">{{ single.text }}</span>
                 </van-grid-item>
               </van-grid>
             </div>
@@ -108,6 +108,9 @@ export default {
         }
       }
     }
+    .textName{
+      margin-top: 20px;
+    }
   }
 }
 </style>
diff --git a/src/views/detail/index.vue b/src/views/detail/index.vue
index d854c06..41590d3 100644
--- a/src/views/detail/index.vue
+++ b/src/views/detail/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="detail">
-    <nav-bar :title="$route.meta.title">
-      <span style="color: #333">
+    <nav-bar :title="info.name">
+      <!-- <span style="color: #333">
         <svg-icon icon-class="share" :width="15" :height="15" />
-      </span>
+      </span>-->
     </nav-bar>
 
     <Swiper :banner="banner" />
@@ -13,6 +13,7 @@
       :desc="info.brief"
       :price="info.retailPrice"
       :discount="info.counterPrice"
+      :virtual-sales="info.virtualSales"
     />
 
     <Section
@@ -63,6 +64,7 @@ import Tabbar from './modules/Tabbar'
 import Sku from './modules/Sku'
 import Skeleton from './modules/Skeleton'
 import _ from 'lodash'
+import wx from 'weixin-js-sdk'
 
 export default {
   name: 'Detail',
@@ -110,6 +112,38 @@ export default {
     this.getMallConfig()
   },
   methods: {
+    wxShare(goodsInfo) {
+      if (!this.wxJsSdkInit()) {
+        return
+      }
+      const url = window.location.href.split('#')[0]
+      const picUrl = url + goodsInfo.picUrl
+      wx.ready(function() {
+        console.log('wx ready')
+        // 需在用户可能点击分享按钮前就先调用
+        wx.updateAppMessageShareData({
+          title: goodsInfo.name, // 分享标题
+          desc: goodsInfo.brief, // 分享描述
+          link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+          imgUrl: picUrl, // 分享图标
+          success: function(e) { console.log('success', e) },
+          fail: function(e) {
+            console.log('fail', e)
+            // alert(JSON.stringify(e))
+          }
+        })
+        wx.updateTimelineShareData({
+          title: goodsInfo.name, // 分享标题
+          link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+          imgUrl: picUrl, // 分享图标
+          success: function(e) { console.log('success', e) },
+          fail: function(e) {
+            console.log('fail', e)
+            // alert(JSON.stringify(e))
+          }
+        })
+      })
+    },
     getMallConfig() {
       getMallConfig().then(res => {
         const { data } = res
@@ -131,6 +165,7 @@ export default {
         console.log('总库存：', this.totalStockNum)
         this.skuAdapter()
         this.isSkeletonShow = false
+        this.wxShare(goods.info)
       })
     },
     async getCommentInfo() {
diff --git a/src/views/detail/modules/Overview.vue b/src/views/detail/modules/Overview.vue
index dadfcd4..3f5a040 100644
--- a/src/views/detail/modules/Overview.vue
+++ b/src/views/detail/modules/Overview.vue
@@ -7,6 +7,7 @@
     <div class="price">
       <span class="price__new">¥{{ price | yuan }}</span>
       <span class="price__old">¥{{ discount | yuan }}</span>
+      <span class="desc" style="float: right;margin:0">销量：{{ virtualSales || 0 }}</span>
     </div>
   </div>
 </template>
@@ -14,7 +15,7 @@
 <script>
 export default {
   // eslint-disable-next-line vue/require-prop-types
-  props: ['title', 'desc', 'price', 'discount']
+  props: ['title', 'desc', 'price', 'discount', 'virtualSales']
 }
 </script>
 
diff --git a/src/views/detail/modules/Section.vue b/src/views/detail/modules/Section.vue
index eabd979..34ead95 100644
--- a/src/views/detail/modules/Section.vue
+++ b/src/views/detail/modules/Section.vue
@@ -15,7 +15,7 @@
           :value="selectedAddress.address || '选择收货地址'"
           @click="handleAddress"
         />
-        <van-cell title="运费" :value="`满${freightLimit}元免运费`" />
+        <van-cell title="运费" value="全国包邮" />
       </van-cell-group>
     </div>
     <!-- <van-button block @click="onSelectSku">
@@ -157,7 +157,7 @@ export default {
   //  width:700px;
   //  margin: 0 auto;
   // border-radius: 6px;
-  margin-top: 24px;
+  margin-top: 12px;
   background: #fff;
   .van-cell__value {
     min-width: 80%;
diff --git a/src/views/detail/modules/Swiper.vue b/src/views/detail/modules/Swiper.vue
index 88b1125..49b7b1a 100644
--- a/src/views/detail/modules/Swiper.vue
+++ b/src/views/detail/modules/Swiper.vue
@@ -2,7 +2,7 @@
   <div style="background:#fff">
     <van-swipe :autoplay="3000" :indicator-color="variables.red">
       <van-swipe-item v-for="(image, index) in banner" :key="index" @click="onSwipeClick(index)">
-        <image-pic width="100%" height="400" :src="image" />
+        <image-pic width="100%" :src="image" />
       </van-swipe-item>
     </van-swipe>
 
diff --git a/src/views/detail/modules/Tabbar.vue b/src/views/detail/modules/Tabbar.vue
index cb33038..4d9f9ac 100644
--- a/src/views/detail/modules/Tabbar.vue
+++ b/src/views/detail/modules/Tabbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="tab-bar">
     <van-goods-action>
-      <van-goods-action-icon icon="chat-o" text="客服" />
+      <van-goods-action-icon icon="home-o" text="首页" @click="goHome" />
       <van-goods-action-icon icon="cart-o" text="购物车" :badge="count" @click="cartClick" />
       <van-goods-action-button type="warning" text="加入购物车" @click="handleClick" />
       <van-goods-action-button :color="variables.red" text="立即购买" @click="handleClick" />
@@ -40,8 +40,10 @@ export default {
     },
     cartClick() {
       this.$router.push({ name: 'Cart' })
+    },
+    goHome() {
+      this.$router.push({ name: 'Home' })
     }
-
   }
 }
 </script>
diff --git a/src/views/home/modules/GoodsLimit.vue b/src/views/home/modules/GoodsLimit.vue
index eb38291..3f3a12d 100644
--- a/src/views/home/modules/GoodsLimit.vue
+++ b/src/views/home/modules/GoodsLimit.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="home-goods">
-    <van-cell :title="titleName" is-link to="index" :value="'更多' + titleName" />
+    <van-cell :title="titleName" is-link to="index" :value="'更多商品'" />
     <van-list
       v-model="loading"
-      :finished="true"
+      :finished="isFinished"
       :immediate-check="false"
       @load="onReachBottom"
     >
@@ -17,6 +17,7 @@
           :desc="item.brief"
           :price="item.retailPrice"
           :discount="item.counterPrice"
+          :virtual-sales="item.virtualSales"
         />
       </div>
     </van-list>
@@ -48,6 +49,10 @@ export default {
     isLoading: {
       type: Boolean,
       default: false
+    },
+    isFinished: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -77,8 +82,12 @@ export default {
     padding: 0 10px;
     display: flex;
     flex-direction: row;
-    justify-content: space-between;
+    justify-content: center;
+    align-items: center;
     flex-wrap: wrap;
   }
 }
+::v-deep .van-cell:after{
+  display: none;
+}
 </style>
diff --git a/src/views/home/modules/Header.vue b/src/views/home/modules/Header.vue
index 9771e3a..b428670 100644
--- a/src/views/home/modules/Header.vue
+++ b/src/views/home/modules/Header.vue
@@ -6,7 +6,7 @@
         <span style="color: #8e8e8e; margin-right: 6px">
           <svg-icon icon-class="search" :width="15" :height="15" />
         </span>
-        <span>搜索商品名称</span>
+        <span>店内搜索</span>
       </van-button>
       <!-- <span style="color: #8e8e8e" @click="onUser">
         <svg-icon icon-class="user" :width="18" :height="18" />
diff --git a/src/views/home/modules/Swiper.vue b/src/views/home/modules/Swiper.vue
index 56cd2c3..7352589 100644
--- a/src/views/home/modules/Swiper.vue
+++ b/src/views/home/modules/Swiper.vue
@@ -2,7 +2,7 @@
   <div>
     <van-swipe :autoplay="3000" indicator-color="white">
       <van-swipe-item v-for="(banner, index) in bannerList" :key="index" @click="onClick(banner.jumpUrl)">
-        <image-pic width="100%" height="150" :src="banner.imgUrl" />
+        <image-pic width="100%" :src="banner.imgUrl" />
       </van-swipe-item>
     </van-swipe>
   </div>
@@ -25,3 +25,9 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+::v-deep .van-image__img {
+  max-height: 42vw;
+}
+</style>
diff --git a/src/views/order/confirm/modules/ListItem.vue b/src/views/order/confirm/modules/ListItem.vue
index d930616..897dbd9 100644
--- a/src/views/order/confirm/modules/ListItem.vue
+++ b/src/views/order/confirm/modules/ListItem.vue
@@ -29,8 +29,9 @@
       <van-cell title="运费">
         <span class="red">{{ freightPrice }} 元</span>
       </van-cell>
-      <van-cell title="优惠券">
-        <span class="red">不可用</span>
+      <van-cell title="优惠券" @click="showPicker = true">
+        <span class="red" v-if="chooseInfo && chooseInfo.id">-{{  chooseInfo.discount }}元</span>
+        <span class="red" v-else>{{ couponList.length }}张可用 </span>
       </van-cell>
       <van-field v-model="message" placeholder="请输入备注" label="订单备注">
         <template slot="icon">{{ 500 }}/50</template>
@@ -43,7 +44,17 @@
       button-text="提交订单"
       :disabled="false"
       @submit="onSubmit"
-    />
+    >
+    <span class="tipsCoupon" v-if="chooseInfo && chooseInfo.id">已优惠-{{  chooseInfo.discount }}元</span>
+    </van-submit-bar>
+    <van-popup v-model="showPicker" position="bottom">
+  <van-picker
+    show-toolbar
+    :columns="couponList"
+    @cancel="showPicker = false"
+    @confirm="onConfirm"
+  />
+</van-popup>
   </div>
 </template>
 
@@ -62,7 +73,11 @@ export default {
       actualPrice: 0,
       freightPrice: 0,
       retryCount: 10, // 查询订单结果次数
-      retryInterval: 600 // 查询间隔
+      retryInterval: 600, // 查询间隔
+      showPicker:false,
+      couponList: [],
+      chooseInfo:{},
+      couponListCopy:[]
     }
   },
   computed: {
@@ -78,11 +93,13 @@ export default {
     getGoodsList() {
       this.goodsList = []
       getCheckedGoods().then((res) => {
-        const { data, orderTotalAmount, goodsAmount, freightPrice } = res.data
+        const { data, orderTotalAmount, goodsAmount, freightPrice, couponList } = res.data
         this.goodsList = data
         this.goodsAmount = goodsAmount
         this.orderTotalAmount = orderTotalAmount
         this.freightPrice = freightPrice
+        this.couponListCopy = couponList
+        this.couponList = couponList.length > 0 ? couponList.map(item=>item.discount+'元'+item.title) : []
       })
     },
     onSubmit() {
@@ -93,6 +110,7 @@ export default {
       const cartIdArr = this.goodsList.map((item) => {
         return item.id
       })
+      const userCouponId = this.chooseInfo && this.chooseInfo.id ? this.chooseInfo.id : undefined
       const message = this.message
       const userId = this.id
       this.$toast.loading({
@@ -101,7 +119,7 @@ export default {
         message: '下单中，请稍后'
       })
       this.retryCount = 6
-      submit({ cartIdArr, addressId, userId, message }).then((res) => {
+      submit({ cartIdArr, addressId, userId, message , userCouponId}).then((res) => {
         const { orderSn, actualPrice } = res.data
         this.orderSn = orderSn
         this.actualPrice = actualPrice
@@ -132,6 +150,11 @@ export default {
           }
         }, this.retryInterval)
       }
+    },
+    onConfirm(val,index){
+      this.showPicker = false
+      this.chooseInfo = this.couponListCopy[index]
+      this.orderTotalAmount = this.goodsAmount + this.freightPrice - this.chooseInfo.discount
     }
   }
 }
@@ -210,4 +233,7 @@ export default {
     }
   }
 }
+.tipsCoupon{
+  margin-top:5px;
+}
 </style>
diff --git a/src/views/order/detail/index.vue b/src/views/order/detail/index.vue
index 1d4b875..80a7481 100644
--- a/src/views/order/detail/index.vue
+++ b/src/views/order/detail/index.vue
@@ -89,7 +89,7 @@ export default {
 }
 .order-detail {
   padding: 10px 20px;
-  > div:nth-child(-n + 10) {
+  > div:nth-child(-n + 11) {
     margin-top: 1vh;
   }
   van-card {
diff --git a/src/views/order/pay/index.vue b/src/views/order/pay/index.vue
index 2094391..ce35a9b 100644
--- a/src/views/order/pay/index.vue
+++ b/src/views/order/pay/index.vue
@@ -23,7 +23,7 @@
             </template>
             <van-radio name="test" />
           </van-cell>
-          <!-- <van-cell>
+          <van-cell>
             <template slot="title">
               <img
                 src="../../../assets/images/ali_pay.png"
@@ -33,18 +33,18 @@
               >
             </template>
             <van-radio name="ali" />
-          </van-cell> -->
-          <!-- <van-cell>
+          </van-cell>
+          <van-cell>
             <template slot="title">
               <img
                 src="../../../assets/images/wx_pay.png"
                 alt="微信支付"
-                width="82"
-                height="29"
+                width="113"
+                height="23"
               >
             </template>
             <van-radio name="wx" />
-          </van-cell> -->
+          </van-cell>
         </van-cell-group>
       </van-radio-group>
     </div>
@@ -61,14 +61,14 @@
 <script>
 import { orderPrepay } from '@/api/pay'
 import _ from 'lodash'
-import { getLocalStorage, setLocalStorage } from '@/utils/localStorage'
+import { getLocalStorage } from '@/utils/localStorage'
 
 export default {
   name: 'Payment',
 
   data() {
     return {
-      payWay: 'test',
+      payWay: '',
       orderSn: undefined,
       actualPrice: 0
     }
@@ -81,135 +81,74 @@ export default {
   },
   methods: {
     pay() {
-      this.$dialog
-        .alert({
-          message:
-            '你选择了' + (this.payWay === 'test' ? '测试支付' : this.payWay === 'wx' ? '微信支付' : '支付宝支付')
-        })
-        .then(() => {
-          if (this.payWay === 'wx') {
-            const ua = navigator.userAgent.toLowerCase()
-            const isWeixin = ua.indexOf('micromessenger') !== -1
-            // 微信jsapi支付
-            if (isWeixin) {
-              orderPrepay({ orderSn: this.orderSn, payType: 3 })
-                .then((res) => {
-                  const data = res.data.wxPayMpOrderResult
-                  const prepayData = JSON.stringify({
-                    appId: data.appId,
-                    timeStamp: data.timeStamp,
-                    nonceStr: data.nonceStr,
-                    package: data.packageValue,
-                    signType: 'MD5',
-                    paySign: data.paySign
-                  })
-                  setLocalStorage({ prepay_data: prepayData })
-
-                  if (typeof WeixinJSBridge === 'undefined') {
-                    if (document.addEventListener) {
-                      document.addEventListener(
-                        'WeixinJSBridgeReady',
-                        this.onBridgeReady,
-                        false
-                      )
-                    } else if (document.attachEvent) {
-                      document.attachEvent(
-                        'WeixinJSBridgeReady',
-                        this.onBridgeReady
-                      )
-                      document.attachEvent(
-                        'onWeixinJSBridgeReady',
-                        this.onBridgeReady
-                      )
-                    }
-                  } else {
-                    this.onBridgeReady()
-                  }
-                })
-                .catch((err) => {
-                  this.$dialog.alert({ message: err.map.msg })
-                  this.$router.replace({
-                    name: 'PayStatus',
-                    params: {
-                      status: 'failed'
-                    }
-                  })
-                })
-            } else {
-              // 微信h5支付
-              orderPrepay({ orderSn: this.orderSn, payType: 1 })
-                .then((res) => {
-                  const data = res.data
-                  window.location.replace(
-                    data.mwebUrl +
-                      '&redirect_url=' +
-                      encodeURIComponent(
-                        window.location.origin +
-                          '/#/?orderSn=' +
-                          this.orderSn +
-                          '&tip=yes'
-                      )
-                  )
-                })
-                .catch((err) => {
-                  console.log(err)
-                  // this.$dialog.alert({ message: '支付失败' })
-                  this.$router.replace({
-                    name: 'PayStatus',
-                    params: {
-                      status: 'failed'
-                    }
-                  })
-                })
-            }
-          } else if (this.payWay === 'ali') {
-            // 支付宝手机网站支付
-            this.$toast.loading({
-              duration: 0, // 持续展示 toast
-              forbidClick: true,
-              message: '支付中，请稍后'
+      if (!this.payWay) {
+        this.$toast.fail('请选择支付方式')
+        return
+      }
+      if (this.payWay === 'wx') {
+        // 微信h5支付
+        const returnUrl = window.location.origin + window.location.pathname + '#/order/payStatus?status=success'
+        orderPrepay({ orderSn: this.orderSn, payType: 5, returnUrl })
+          .then((res) => {
+            window.location.href = res.data.epayurl
+          })
+          .catch((err) => {
+            console.log(err)
+            // this.$dialog.alert({ message: '支付失败' })
+            this.$router.replace({
+              name: 'PayStatus',
+              params: {
+                status: 'failed'
+              }
             })
-            const returnUrl = window.location.origin + window.location.pathname + '#/order/payStatus?status=success'
-            orderPrepay({ orderSn: this.orderSn, payType: 2, returnUrl })
-              .then((res) => {
-                this.alipayClientCall(res.data.form)
-              })
-              .catch((err) => {
-                console.log(err)
-                this.$router.replace({
-                  name: 'PayStatus',
-                  params: {
-                    status: 'failed'
-                  }
-                })
-              })
-          } else {
-            // 测试支付
-            this.$toast.loading({
-              duration: 0, // 持续展示 toast
-              forbidClick: true,
-              message: '支付中，请稍后'
+          })
+      } else if (this.payWay === 'ali') {
+        // 支付宝手机网站支付
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true,
+          message: '支付中，请稍后'
+        })
+        const returnUrl = window.location.origin + window.location.pathname + '#/order/payStatus?status=success'
+        orderPrepay({ orderSn: this.orderSn, payType: 4, returnUrl })
+          .then((res) => {
+            window.location.href = res.data.epayurl
+          })
+          .catch((err) => {
+            console.log(err)
+            this.$router.replace({
+              name: 'PayStatus',
+              params: {
+                status: 'failed'
+              }
             })
-            orderPrepay({ orderSn: this.orderSn, payType: 99 })
-              .then((res) => {
-                this.$router.replace({
-                  name: 'PayStatus',
-                  params: {
-                    status: 'success'
-                  }
-                })
-              })
-              .catch((err) => {
-                console.log(err)
-                this.$router.replace({
-                  name: 'PayStatus',
-                  params: {
-                    status: 'failed'
-                  }
-                })
-              })
-          }
+          })
+      } else {
+        // 测试支付
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true,
+          message: '支付中，请稍后'
         })
+        orderPrepay({ orderSn: this.orderSn, payType: 99 })
+          .then((res) => {
+            this.$router.replace({
+              name: 'PayStatus',
+              params: {
+                status: 'success'
+              }
+            })
+          })
+          .catch((err) => {
+            console.log(err)
+            this.$router.replace({
+              name: 'PayStatus',
+              params: {
+                status: 'failed'
+              }
+            })
+          })
+      }
     },
     /**
      * 通过提交form表单唤起支付宝客户端支付
diff --git a/src/views/search/list.vue b/src/views/search/list.vue
index 63fa65d..a042689 100644
--- a/src/views/search/list.vue
+++ b/src/views/search/list.vue
@@ -20,6 +20,7 @@
             :desc="item.brief"
             :price="item.retailPrice"
             :discount="item.counterPrice"
+            :virtual-sales="item.virtualSales"
           />
         </div>
       </van-list>
diff --git a/src/views/user/modules/Info.vue b/src/views/user/modules/Info.vue
index df85989..a9edc9e 100644
--- a/src/views/user/modules/Info.vue
+++ b/src/views/user/modules/Info.vue
@@ -11,7 +11,7 @@
       </div>
       <div class="main__id" @click="doCopy(userInfo.id)">
         <span class="code">用户id：{{ userInfo.id }}</span>
-        <span style="color: #fff">
+        <span style="color: #666">
           <svg-icon icon-class="copy" :width="13" :height="13" />
         </span>
       </div>
@@ -56,7 +56,7 @@ export default {
   display: flex;
   flex-direction: row;
   padding: 60px 24px 50px 24px;
-  background: $red;
+
   border-radius: 100% 100% 100% 100% / 0% 0% 16% 16%;
   .userImg {
     img {
@@ -69,7 +69,7 @@ export default {
     position: absolute;
     top: 20px;
     right: 20px;
-    color: #fff;
+    color: #000;
     font-size: 50px;
   }
   .main {
@@ -82,7 +82,7 @@ export default {
       .name {
         font-size: $large;
         font-weight: 500;
-        color: #fff;
+        color: #000;
         display: inline-block;
         max-width: 350px;
         white-space: nowrap;
@@ -96,7 +96,7 @@ export default {
       .code {
         font-size: $small;
         font-weight: 400;
-        color: #fff;
+        color: $gray;
         margin-right: 10px;
       }
     }
diff --git a/src/views/user/modules/Tools.vue b/src/views/user/modules/Tools.vue
index 0d550d4..8813cb6 100644
--- a/src/views/user/modules/Tools.vue
+++ b/src/views/user/modules/Tools.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="user-tools">
+    <van-cell title="优惠券" is-link to="order/my" />
     <van-cell title="收货地址" is-link to="address" />
     <van-cell title="退出登录" is-link @click="logout" />
   </div>
diff --git a/src/views/userSetting/index.vue b/src/views/userSetting/index.vue
index 2560239..436c56c 100644
--- a/src/views/userSetting/index.vue
+++ b/src/views/userSetting/index.vue
@@ -29,7 +29,7 @@
         is-link
         @click="showBirthday = true"
       />
-      <van-cell title="密码设置" to="/userSetting/password" is-link />
+      <!-- <van-cell title="密码设置" to="/userSetting/password" is-link /> -->
     </van-cell-group>
     <van-popup v-model="showBirthday" round position="bottom">
       <van-datetime-picker