houwei 4 years ago
parent
commit
0761a81dad
5 changed files with 43 additions and 87 deletions
  1. 2 2
      src/api/ajax.js
  2. 2 2
      src/api/index.js
  3. 27 63
      src/pages/index.vue
  4. 10 18
      src/pages/payDetails.vue
  5. 2 2
      src/pages/payList.vue

+ 2 - 2
src/api/ajax.js

@@ -3,8 +3,8 @@ import qs from 'qs';
 import { Message } from 'element-ui';
 // import {BASE_URL} from '/wx'
 
-axios.defaults.baseURL = '/api';
-// axios.defaults.baseURL = 'https://yuehe.hellevil.com/'
+// axios.defaults.baseURL = '/api';
+axios.defaults.baseURL = 'https://yuehe.hellevil.com/'
 axios.defaults.headers.common['Content-Type'] = 'application/json; charset=UTF-8';
 //网络请求
 export default function ajax(url, data = {}, type = 'GET', isupload) {

+ 2 - 2
src/api/index.js

@@ -1,6 +1,6 @@
 import ajax from './ajax';
-// let openid = window.localStorage.getItem("openId");
-let openId = 'oyp646XW37eIqrv3XisVWQ3xq3BQ';
+let openId = window.localStorage.getItem("openId");
+// let openId = 'oyp646XW37eIqrv3XisVWQ3xq3BQ';
 //获取openid
 export const getOpenId = params => ajax(`/wx/mpuser/wxeef6678b92b6c856/info`, params, 'GET');
 // 支付获取参数

+ 27 - 63
src/pages/index.vue

@@ -50,8 +50,7 @@
         /> -->
         <div class="xy" @click="goXy()">
           点击购买即代表同意<span style="color: #fff; font-weight: 900"
-            >《平台用户服务协议》</span
-          >
+            >《平台用户服务协议》</span>
         </div>
       </div>
     </div>
@@ -83,24 +82,19 @@ export default {
       this.$router.push("/xy");
     },
     goDetails(item) {
-      console.log(item)
-       this.$router.push({name:'payDetails',query: {contentImg:item.contentImg,valuable:item.valuable,title:item.title}})
-      // this.$router.push("/firstPay");
+      console.log(item);
+      this.$router.push({
+        name: "payDetails",
+        query: {
+          contentImg: item.contentImg,
+          valuable: item.valuable,
+          title: item.title,
+        },
+      });
     },
-    // goSecond() {
-    //   this.$router.push("/secondPay");
-    // },
-    // goThird() {
-    //   this.$router.push("/thirdPay");
-    // },
     radioChange: (val) => {
       console.log(val);
-      // console.log(this.radioTreaty)
     },
-    // checkboxChange: (val) => {
-    //   this.checked = val;
-    //   console.log(this.checked);
-    // },
     jsSdk() {
       // 判断微信的WeixinJSBridge
       console.log(typeof WeixinJSBridge);
@@ -140,8 +134,17 @@ export default {
       );
     },
     async pay() {
+      if(!this.radioTreaty){
+         this.$message({
+          message: '至少选择一种权益哦',
+          type: 'warning'
+        });
+        return;
+      }
+      console.log(this.radioTreaty);
       let params = {};
-      for (let i = 0; i++; i < this.arr.length) {
+      for (let i = 0; i < this.arr.length; i++) {
+        console.log(this.arr[i].valuable);
         if (this.arr[i].valuable == this.radioTreaty) {
           params = {
             body: this.arr[i].title,
@@ -150,48 +153,11 @@ export default {
             spbillCreateIp: "127.0.0.1",
             notifyUrl: "https://yuehe.hellevil.com/pay/notify/order",
             tradeType: "JSAPI",
-            openid: "oyp646XW37eIqrv3XisVWQ3xq3BQ",
-            // openid: window.localStorage.getItem("openId"),
+            // openid: "oyp646XW37eIqrv3XisVWQ3xq3BQ",
+            openid: window.localStorage.getItem("openId"),
           };
         }
       }
-      // }
-      // if (this.radioTreaty == "1") {
-      //   params = {
-      //     body: "wxtest199",
-      //     outTradeNo: new Date().getTime(),
-      //     totalFee: "1",
-      //     spbillCreateIp: "127.0.0.1",
-      //     notifyUrl: "https://yuehe.hellevil.com/pay/notify/order",
-      //     tradeType: "JSAPI",
-      //     openid: "oyp646XW37eIqrv3XisVWQ3xq3BQ",
-      //     // openid: window.localStorage.getItem("openId"),
-      //   };
-      // }
-      // if (this.radioTreaty == "2") {
-      //   params = {
-      //     body: "wxtest399",
-      //     outTradeNo: new Date().getTime(),
-      //     totalFee: "2",
-      //     spbillCreateIp: "127.0.0.1",
-      //     notifyUrl: "https://yuehe.hellevil.com/pay/notify/order",
-      //     tradeType: "JSAPI",
-      //     openid: "oyp646XW37eIqrv3XisVWQ3xq3BQ",
-      //     // openid: window.localStorage.getItem("openId"),
-      //   };
-      // }
-      // if (this.radioTreaty == "3") {
-      //   params = {
-      //     body: "wxtest1999",
-      //     outTradeNo: new Date().getTime(),
-      //     totalFee: "3",
-      //     spbillCreateIp: "127.0.0.1",
-      //     notifyUrl: "https://yuehe.hellevil.com/pay/notify/order",
-      //     tradeType: "JSAPI",
-      //     openid: "oyp646XW37eIqrv3XisVWQ3xq3BQ",
-      //     // openid: window.localStorage.getItem("openId"),
-      //   };
-      // }
       console.log(params);
       const result = await getPay(params);
       console.log(result);
@@ -207,15 +173,13 @@ export default {
   },
   computed: {},
   async mounted() {
-    // openId.getOpenId(() => {
-    //   let openid = window.localStorage.getItem("openId");
-    //   console.log(openid, "我是获取的openid");
-    // });
+    openId.getOpenId(() => {
+      let openid = window.localStorage.getItem("openId");
+      console.log(openid, "我是获取的openid");
+    });
     const result = await getPayList();
-    console.log(result);
     this.arr = result.grades;
-    console.log(this.arr);
-
+    // console.log(this.arr);
   },
 };
 </script>

+ 10 - 18
src/pages/payDetails.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
-    <el-image
-      style="width: 100%"
-      :src="contentImg"
-      fit="contain"
-    ></el-image>
+    <el-image style="width: 100%" :src="contentImg" fit="contain"></el-image>
     <div class="pay_area">
       <div class="btn" @click="pay">¥{{ valuable / 100 }} 立即购买</div>
       <div style="display: flex; justify-content: center">
@@ -26,9 +22,9 @@ export default {
   name: "payDetails",
   data() {
     return {
-      contentImg:'',
-      valuable:'',
-      title:'',
+      contentImg: "",
+      valuable: "",
+      title: "",
       url: require("../assets/199.png"),
       payOptions: {
         appId: "", //公众号名称,由商户传入
@@ -42,7 +38,6 @@ export default {
   },
   methods: {
     goXy() {
-      // this.$router.push({ name: "xy", query: { item: this.data } });
       this.$router.push("/xy");
     },
     jsSdk() {
@@ -91,8 +86,8 @@ export default {
         spbillCreateIp: "127.0.0.1",
         notifyUrl: "https://yuehe.hellevil.com/pay/notify/order",
         tradeType: "JSAPI",
-        openid: "oyp646XW37eIqrv3XisVWQ3xq3BQ",
-        // openid: window.localStorage.getItem("openId"),
+        // openid: "oyp646XW37eIqrv3XisVWQ3xq3BQ",
+        openid: window.localStorage.getItem("openId"),
       };
       console.log(params);
       const result = await getPay(params);
@@ -109,16 +104,13 @@ export default {
   },
   computed: {},
   mounted() {
+    openId.getOpenId(() => {
+      let openid = window.localStorage.getItem("openId");
+      console.log(openid, "我是获取的openid");
+    });
     this.contentImg = this.$route.query.contentImg;
     this.valuable = this.$route.query.valuable;
     this.title = this.$route.query.title;
-    console.log(this.contentImg);
-    console.log(this.valuable);
-    console.log(this.title);
-    // openId.getOpenId(() => {
-    //   let openid = window.localStorage.getItem("openId");
-    //   console.log(openid, "我是获取的openid");
-    // });
   },
 };
 </script>

+ 2 - 2
src/pages/payList.vue

@@ -64,8 +64,8 @@ export default {
   methods: {},
   computed: {},
   async mounted() {
-    // const result = await getMypayList();
-    // this.arr = result.orders;
+    const result = await getMypayList();
+    this.arr = result.orders;
   },
 };
 </script>