洪海涛 8 жил өмнө
parent
commit
aa88d762a0

+ 9 - 2
www/vue/dist/index.html

@@ -1,8 +1,15 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no"><script type=text/javascript src=https://code.jquery.com/jquery-2.2.0.min.js></script><script type=text/javascript src="http://webapi.amap.com/maps?v=1.3&key=ea4228b685c663ac62af7da3a0702c97"></script><title>vue</title><style>html, body {
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no"><script type=text/javascript src=https://code.jquery.com/jquery-2.2.0.min.js></script><script type=text/javascript src="http://webapi.amap.com/maps?v=1.3&key=ea4228b685c663ac62af7da3a0702c97"></script><title>vue</title><style>html{
+
+      font-size: 120%;
+    }
+    body {
       height: 100%;
       width: 100%;
       overflow-x: hidden;
-      font-size: 120%;
+      font-size: 17px;
+      line-height: 21px;
+      color: #000;
+      background-color: #fff;
     }
 
     * {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/vue/dist/static/css/app.css


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/vue/dist/static/js/app.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/vue/dist/static/js/vendor.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 90 - 2
www/vue/src/components/pay.vue


+ 12 - 19
www/vue/src/components/recharge.vue

@@ -42,7 +42,6 @@
 </template>
 
 <script>
-  import {mapState, mapActions} from 'vuex'
   import {Group, Cell} from 'vux'
   import axios from 'axios'
   import qs from 'qs'
@@ -52,7 +51,7 @@
       return {
         isActive: false,
         isShow: -1,
-        rechargeLists: this.$store.state.recharge.rechargeList,
+        rechargeLists: [],
         rechargeItem: {},
         otherAmount: ''
       }
@@ -60,12 +59,12 @@
     components: {
       Group, Cell
     },
-    computed: {
-      ...mapState({
-        rechargeList: state => state.rechargeList
-      })
-    },
+    computed: {},
     beforeCreate () {
+      // 获取充值卡列表
+      axios.get('o2o/recharge/rechargeList').then(res => {
+        this.rechargeLists = res.data.data
+      })
     },
     created () {
 //      console.log(this.rechargeLists)
@@ -89,9 +88,6 @@
       }
     },
     methods: {
-      ...mapActions([
-        'RECHARGELIST'
-      ]),
       btnRechargeList (item, index) {
         if (index !== 4) {
           this.otherAmount = ''
@@ -130,18 +126,15 @@
         }
         let payRecharge = {}
         axios.post('o2o/recharge/addRechargeorder', qs.stringify(addRechargeOrder)).then(res => {
-          console.log(res.data.success)
           if (res.data.success) {
-            this.$router.push({path: '/pay'})
+            payRecharge = {
+              user_id: res.data.data.user.$id,
+              pay_channel: 'wx_pub',
+              order_id: res.data.data._id.$id
+            }
+            this.$router.push({path: '/pay', query: {payRecharge: payRecharge}})
           }
-          payRecharge = {
-            user_id: config.userId,
-            pay_channel: 'wx_pub',
-            order_id: res.data.data._id.$id
-          }
-          console.log(payRecharge)
         })
-
         // axios     1.创建充值卡订单  user_id: user.id,        value:inputVal,
         // 第二步
       },

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно