Skip to content

Commit a94f511

Browse files
gookinggooking
committed
整改
1 parent 8f712ee commit a94f511

File tree

120 files changed

+6750
-4833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+6750
-4833
lines changed

‎App.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
globalData: {
77
h5Domain: 'https://flpt.jxsupplier.com',
88
goLogin: false,
9-
subDomain: 'bnhj', // jdjf0115
10-
merchantId: '88', // 42151
9+
subDomain: 'cysx', // jdjf0115
10+
merchantId: 10, // 42151
1111
version: '1.2.0',
1212
sysconfigkeys: 'mallName,shopMod,share_profile,recharge_amount_min,open_growth,shopping_cart_vop_open',
1313
wxpayOpenAppId: 'wx9b04553fd8c7b9c3', // 微信开放平台的移动端应用appID

‎common/wxauth.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ async function authorize() {
165165
name: 'uid',
166166
value: res.data.uid
167167
})
168+
store.commit('$uStore', {
169+
name: 'mobile',
170+
value: res.data.mobile
171+
})
168172
resolve(res)
169173
} else {
170174
wx.showToast({
@@ -188,6 +192,10 @@ async function authorize() {
188192
name: 'uid',
189193
value: res.data.uid
190194
})
195+
store.commit('$uStore', {
196+
name: 'mobile',
197+
value: res.data.mobile
198+
})
191199
resolve(res)
192200
} else {
193201
wx.showToast({

‎components/ystk/ystk.vue‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<template>
2+
<view v-if="!agreeYxtk" class="agreement">
3+
<u-popup :show="popupShow" mode="center" :closeOnClickOverlay="false" round="16rpx">
4+
<view class="t">用户协议及隐私政策</view>
5+
<view class="content">
6+
您在使用我们的服务时，我们可能会收集和
7+
使用您的相关信息。我们希望通过本
8+
<text class="link" @click="goYstk('yhxy')">《用户协议》</text>
9+
及<text class="link" @click="goYstk('ysxy')">《隐私协议》</text>向您说明，在使用我
10+
们的服务时，我们如何收集、使用、储存和
11+
分享这些信息，以及我们为您提供的访问、
12+
更新、控制和保护这些信息的方式。本<text class="link" @click="goYstk('yhxy')">《用户协议》</text>及
13+
<text class="link" @click="goYstk('ysxy')">《隐私协议》</text>，希望您仔细闭读，
14+
充分理解协议中的内容后再点击同意。
15+
</view>
16+
<view class="btn-group">
17+
<u-button @click="notagree">不同意</u-button>
18+
<u-button type="primary" customStyle="margin-top: 32rpx;" @click="aggree">同意并继续</u-button>
19+
</view>
20+
</u-popup>
21+
</view>
22+
</template>
23+
24+
<script>
25+
export default {
26+
data() {
27+
return {
28+
categoryList: undefined,
29+
categoryIdx: 0,
30+
31+
page: 1,
32+
serverPics: undefined,
33+
popupShow: true,
34+
35+
items: [],
36+
}
37+
},
38+
props: {
39+
a: Boolean,
40+
},
41+
mounted() {
42+
},
43+
methods: {
44+
notagree() {
45+
uni.navigateTo({
46+
url: '/pages/notagree'
47+
})
48+
},
49+
goYstk(key) {
50+
uni.navigateTo({
51+
url: '/pages/agreement?key=' + key
52+
})
53+
},
54+
aggree() {
55+
this.$u.vuex('agreeYxtk', true)
56+
}
57+
}
58+
}
59+
</script>
60+
61+
<style lang="scss" scoped>
62+
.t {
63+
text-align: center;
64+
padding: 32rpx;
65+
font-weight: bold;
66+
}
67+
.content {
68+
width: 600rpx;
69+
padding: 32rpx;
70+
font-size: 32rpx;
71+
line-height: 54rpx;
72+
}
73+
.link {
74+
color: #10AEFF;
75+
}
76+
.btn-group {
77+
padding: 32rpx;
78+
}
79+
.mt32 {
80+
margin-top: 32rpx;
81+
}
82+
</style>

0 commit comments

Comments
 (0)