Joe 4 年 前
コミット
c1d04a8623

+ 3 - 4
components/ProductList.vue

@@ -7,7 +7,7 @@
       @load="onLoad"
     >
       <div class="shoplist">
-        <div class="list-item" v-for="item in list" :key="item.src">
+        <nuxt-link class="list-item" v-for="item in list" :key="item.src" to="/point/detail" tag="div">
           <div class="list-item-left">
             <img :src="item.waresPic" alt="" srcset="" />
           </div>
@@ -20,10 +20,10 @@
             </div>
             <div class="item-right-bottom">
               <span class="price"><span class="icon"></span>40</span>
-              <span class="sold">已 233</span>
+              <span class="sold">已兑换 233</span>
             </div>
           </div>
-        </div>
+        </nuxt-link>
       </div>
     </van-list>
   </van-pull-refresh>
@@ -169,7 +169,6 @@ export default {
   margin-right: 0.1rem;
 }
 .shoplist .list-item .list-item-right .item-right-bottom .sold {
-  width: 1.16rem;
   height: 0.4rem;
   font-size: 0.28rem;
   font-family: PingFangSC-Regular, PingFang SC;

BIN
dist.zip


+ 2 - 1
layouts/default.vue

@@ -30,8 +30,9 @@ html {
     'Helvetica Neue',
     Arial,
     sans-serif;
-    /* font-size: 13.6986301369863vw;*/
     font-size: 13.333333333333333vw;
+    -ms-text-size-adjust:none;
+    -webkit-text-size-adjust:none;
 }
 body {
   font-size: 12px;	

+ 3 - 1
nuxt.config.js

@@ -3,8 +3,10 @@ export default {
   server: {
     port: 8081, // default: 3000
     // host: '192.168.3.14' // default: localhost
-    host:"localhost"
+    // host:"localhost",
+    host:"192.168.0.105",
   },
+  // disableHostCheck: true,
   modules: [
     '@nuxtjs/axios',
     '@nuxtjs/proxy'

+ 46 - 0
pages/authen.vue

@@ -0,0 +1,46 @@
+<template>
+  <div>
+  123
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue';
+  export default Vue.extend({
+    head() {
+      return {
+        title: '认证过渡页面'
+      }
+    },
+    data() {
+      return {
+      };
+    },
+    // created() {
+    //   console.log(this.$route.query);
+    //   this.stationId = this.$route.query.stationId;
+    //   this.stationName = this.$route.query.stationName;
+    //   this.gasNum = this.$route.query.gasNum;
+    //   this.oilName = this.$route.query.oilName;
+    //   this.account = this.$route.query.account;
+    // },
+    mounted() {
+      console.log("route");
+      console.log(this.$route)
+      console.log(this.$route.query);
+      console.log("this")
+      // console.log(this.$axios.$get("/getGzhAuthorizeInfo",{
+      //   params: {
+      //     code:this.$route.query.code,
+      //     stationId:"1"
+      //   }
+      // }))
+
+    },
+    methods: {
+    }
+  })
+</script>
+
+<style lang="less">
+</style>

+ 24 - 14
pages/point/detail.vue

@@ -5,19 +5,22 @@
     </div>
     <div class="title">
       <div class="text">教育读本</div>
-      <div class="price">¥<span class="amount">99.00</span></div>
-      <div class="sold">已售223</div>
+      <div class="price">
+        <span class="icon"></span>
+        <span class="amount">99.00</span>
+      </div>
+      <div class="sold">已兑换223</div>
     </div>
-    <div class="selected">
+    <!-- <div class="selected">
       <div class="text">已选</div>
       <div class="content">儿童情商课+智慧课堂,1</div>
       <div class="icon"></div>
-    </div>
-    <div class="pictures">
+    </div> -->
+    <!-- <div class="pictures">
       <div class="text">- 图文详情 -</div>
-    </div>
+    </div> -->
     <div class="buy">
-      <button class="buy">立刻购买</button>
+      <nuxt-link to="/point/pay" tag="button">立刻兑换</nuxt-link>
     </div>
   </div>
 </template>
@@ -97,7 +100,6 @@ export default {
   top: 0.3rem;
 }
 .point-detail .title .price {
-  width: 1.34rem;
   height: 0.7rem;
   font-size: 0.28rem;
   font-family: PingFangSC-Semibold, PingFang SC;
@@ -108,11 +110,19 @@ export default {
   left: 0.57rem;
   bottom: 0.27rem;
 }
+.point-detail .title .price .icon {
+  display: inline-block;
+  width: 0.3rem;
+  height: 0.3rem;
+  background: url("../../static/common/a01_jifen@2x.png") no-repeat;
+  background-size: cover;
+  margin-right: 0.1rem;
+}
 .point-detail .title .price .amount {
+  display: inline-block;
   font-size: 0.5rem;
 }
 .point-detail .title .sold {
-  width: 1.07rem;
   height: 0.4rem;
   font-size: 0.28rem;
   font-family: PingFangSC-Regular, PingFang SC;
@@ -166,7 +176,7 @@ export default {
   width: 100%;
   height: 3.2rem;
   background: #ffffff;
-  margin-top:.21rem;
+  margin-top: 0.21rem;
   position: relative;
 }
 
@@ -179,15 +189,15 @@ export default {
   color: #aaaaaa;
   line-height: 1.1rem;
   position: absolute;
-  top:0rem;
-  left:2.88rem
+  top: 0rem;
+  left: 2.88rem;
 }
 .point-detail .buy {
   position: fixed;
   bottom: 0.83rem;
   left: 0;
   right: 0;
-  height: 100px;
+  height: 1.03rem;
 }
 
 .point-detail .buy button {
@@ -204,6 +214,6 @@ export default {
   font-weight: 400;
   color: #ffffff;
   line-height: 0.4rem;
-  margin:0 auto;
+  margin: 0 auto;
 }
 </style>

+ 25 - 22
pages/point/index.vue

@@ -2,7 +2,7 @@
   <div class="point-index">
     <div class="background">
       <div class="top">
-        <h4 class="text">我的积分</h4>
+        <nuxt-link class="text" to="/point/list" tag="h4">我的积分</nuxt-link>
         <h2 class="point">999</h2>
         <div class="earn">
           <div>赚积分</div>
@@ -11,22 +11,22 @@
     </div>
     <div class="container">
       <div class="menu">
-        <div class="item item1">
+        <nuxt-link class="item item1" to="/point/shop" tag="div">
           <img src="../../static/point/shangcheng.png" alt="" />
           <span>积分商城</span>
-        </div>
-        <div class="item item2">
+        </nuxt-link>
+        <nuxt-link class="item item2"  to="/point/bill" tag="div">
           <img src="../../static/point/mingxi.png" alt="" />
           <span>积分明细</span>
-        </div>
-        <div class="item item3">
+        </nuxt-link>
+        <nuxt-link class="item item3" to="/point/list" tag="div">
           <img src="../../static/point/dingdan.png" alt="" />
           <span>积分订单</span>
-        </div>
+        </nuxt-link>
       </div>
-      <div class="news">
+      <nuxt-link class="news" to="/point/shop" tag="div">
         <img src="../../static/test/new.png" alt="" />
-      </div>
+      </nuxt-link>
       <div class="show">
         <product-list/>
       </div>
@@ -108,21 +108,21 @@ export default {
   background-size: 100% 100%;
   z-index: -1;
 }
-.point-index .background .text {
+.point-index .background .top .text {
   position: absolute;
   left: 4vw;
   top: 8vw;
   margin: 0;
   padding: 0;
-  width: 14.9vw;
-  height: 5.33vw;
-  font-size: 3.7vw;
+height: 0.4rem;
+font-size: 0.28rem;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #ffffff;
-  line-height: 5.33vw;
+
+line-height: 0.4rem;
 }
-.point-index .background .point {
+.point-index .background .top .point {
   position: absolute;
   margin: 0;
   padding: 0;
@@ -140,8 +140,8 @@ export default {
   position: absolute;
   right: 0;
   top: 20.66vw;
-  width: 21.33vw;
-  height: 7.33vw;
+  width: 1.6rem;
+  height: 0.55rem;
   font-size: 3.46vw;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
@@ -192,16 +192,19 @@ export default {
   margin: 0 auto;
 }
 .point-index .container .menu .item span {
-  display: block;
-  width: 100%;
-  height: 3.73vw;
-  font-size: 3.73vw;
+  display: inline-block;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #666666;
-  line-height: 3.73vw;
   text-align: center;
   margin-top: 3vw;
+  width: 1.3rem;
+  height: 0.4rem;
+  font-size: 0.28rem;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  line-height: 0.4rem;
 }
 
 .point-index .container .news {

+ 6 - 7
pages/point/list.vue

@@ -3,14 +3,13 @@
     <div class="order">
       <div class="top">
         <div class="code">订单号 836847623234289</div>
-        <div class="status">待付款</div>
       </div>
       <div class="middle">
         <div class="imgcon">
           <img :src="listsrc" alt="" srcset="" />
         </div>
         <div class="content">
-          <div class="title">DMS CORTHE 水光气垫</div>
+          <div class="title">水光气垫</div>
           <div class="desc">15g SPF 50+ PA +++ 自然白</div>
           <div class="amount">
             <div>
@@ -21,13 +20,13 @@
         </div>
       </div>
 
-      <div class="footer">
+      <!-- <div class="footer">
         <span class="paytime">付款倒计时:23:59:59</span>
         <div class="paybutton">
           <button class="cancel">取消订单</button>
           <button class="pay">立刻付款</button>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="order">
       <div class="top">
@@ -39,7 +38,7 @@
           <img :src="listsrc" alt="" srcset="" />
         </div>
         <div class="content">
-          <div class="title">DMS CORTHE 水光气垫</div>
+          <div class="title">水光气垫</div>
           <div class="desc">15g SPF 50+ PA +++ 自然白</div>
           <div class="amount">
             <div>
@@ -50,13 +49,13 @@
         </div>
       </div>
 
-      <div class="footer">
+      <!-- <div class="footer">
         <span class="paytime">付款倒计时:23:59:59</span>
         <div class="paybutton">
           <button class="cancel">取消订单</button>
           <button class="pay">立刻付款</button>
         </div>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>

+ 1 - 1
pages/point/pay.vue

@@ -18,7 +18,7 @@
     </div>
     <div class="total">
       <div class="text">合计:<span class="num">99积分</span></div>
-      <button>提交订单</button>
+      <nuxt-link to="/point/success" tag="button">提交订单</nuxt-link>
     </div>
   </div>
 </template>

+ 0 - 0
pages/shop/index.vue → pages/point/shop.vue


+ 2 - 3
pages/point/success.vue

@@ -2,11 +2,11 @@
   <div class="point-success">
     <div class="background">
       <span class="icon"></span>
-      <span class="text">支付成功</span>
+      <span class="text">兑换成功</span>
     </div>
     <div class="container">
       <div class="menu">
-        <span class="text1">回到首页</span> <span class="text2">查看订单</span>
+        <nuxt-link class="text1" to="/point" tag="span">回到首页</nuxt-link> <nuxt-link class="text2"  to="/point/list" tag="span">查看订单</nuxt-link>
       </div>
       <div class="show">
         <product-list />
@@ -143,7 +143,6 @@ export default {
   align-items: center;
 }
 .point-success .container .menu span {
-  width: 1.28rem;
   height: 0.45rem;
   font-size: 0.32rem;
   font-family: PingFangSC-Regular, PingFang SC;