cr лет назад: 4
Родитель
Сommit
ee07413192
3 измененных файлов с 20 добавлено и 15 удалено
  1. 6 13
      src/App.vue
  2. 1 1
      src/pages/wallet/bill.vue
  3. 13 1
      src/pages/wallet/index.vue

+ 6 - 13
src/App.vue

@@ -17,19 +17,7 @@ export default {
17 17
             console.log(option);
18 18
         }
19 19
 
20
-        uni.getSystemInfo({
21
-            success: function (res) {
22
-                if (res.model.indexOf("iPhone X") > -1) {
23
-                    self.$store.commit("common/update", {
24
-                        iphoneX: true,
25
-                    });
26
-                } else {
27
-                    self.$store.commit("common/update", {
28
-                        iphoneX: false,
29
-                    });
30
-                }
31
-            },
32
-        });
20
+
33 21
 
34 22
         let user = this.$store.state.user.user;
35 23
         console.log(user);
@@ -71,6 +59,11 @@ export default {
71 59
 
72 60
     onShow: async function (option) {
73 61
         const self = this;
62
+        uni.getSystemInfo({
63
+            success:res=>{
64
+                console.log(res);
65
+            }
66
+        })
74 67
 
75 68
         // 保存盒子id
76 69
         if (option.query.bid) {

+ 1 - 1
src/pages/wallet/bill.vue

@@ -3,7 +3,7 @@
3 3
         <ul class="list">
4 4
             <li class="item" v-for="item of list" :key="item.id">
5 5
                 <div class="name">
6
-                    {{ item.date | dateFormat("yyy/MM/dd") }}
6
+                    {{ item.date | dateFormat("yyyy/MM/dd") }}
7 7
                     <span class="status">{{ item.status | status }}</span>
8 8
                 </div>
9 9
                 <div class="right">

+ 13 - 1
src/pages/wallet/index.vue

@@ -129,6 +129,8 @@ export default {
129 129
             loading: false,
130 130
             showErr: false,
131 131
             errStr: "",
132
+            deviceName:'',
133
+            deviceInfo:''
132 134
         };
133 135
     },
134 136
     filters: {
@@ -151,7 +153,15 @@ export default {
151 153
             return obj[v] || "";
152 154
         },
153 155
     },
154
-    onLoad() {},
156
+    onLoad() {
157
+    let self = this;
158
+        uni.getSystemInfo({
159
+            success: function (res) {
160
+               self.deviceName = res.brand;
161
+               self.deviceInfo = res.model;
162
+            },
163
+        });
164
+    },
155 165
     async onShow() {
156 166
         this.getWithdrawalInfo();
157 167
     },
@@ -198,6 +208,8 @@ export default {
198 208
             let data = {
199 209
                 amount: this.formVal * 100,
200 210
                 // remark: value,
211
+                deviceInfo:this.deviceInfo,
212
+                deviceName:this.deviceName
201 213
             };
202 214
             this.api
203 215
                 .post("/User/Withdrawal", data, { pass: true })