程序上线测试

api/http.js

@@ -25,7 +25,8 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
 			}
 			
 			if(res.statusCode == 401 || 
-			res.data.message == '操作失败，token非法无效!'){
+			res.data.message == '操作失败，token非法无效!' || 
+			res.data.message == '操作失败，用户不存在!'){
 				uni.removeStorageSync('token')
 				console.error('登录过期');
 				uni.navigateTo({

components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue

@@ -6,7 +6,7 @@
 			</view>
 			<view class="content_pri">
 				<view class="text">
-					欢迎来到xx加油!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
+					欢迎来到车队佳油!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
 				</view>
 			</view>
 			<view class="config">
@@ -14,18 +14,20 @@
 					<view class="content">
 						<view style="display: flex;">
 							<uv-checkbox size="30rpx" :name="1"></uv-checkbox>
-							同意<text>《xx加油隐私政策》</text>
+							同意<text @click="goToPrivacy">《车队佳油隐私政策》</text>
 						</view>
 						<view class="">
-							以及<text>《用户协议》</text>
+							以及<text @click="goToPrivacy">《用户协议》</text>
 						</view>
 					</view>
 				</uv-checkbox-group>
 			</view>
 			<view class="pri_btn">
 				<!-- <button class="confuse_btn" @click="confusePrivacy">拒绝</button> -->
-				<button class="confirm_btn" id="agree-btn" open-type="agreePrivacyAuthorization"
-					@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
+				<button 
+				class="confirm_btn" id="agree-btn" 
+				open-type="agreePrivacyAuthorization"
+				@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
 			</view>
 		</view>
 	</uv-popup>
@@ -40,6 +42,20 @@
 				checkboxValue : false
 			}
 		},
+		mounted() {
+			if(wx.getPrivacySetting){
+				wx.getPrivacySetting({
+					success: res => {
+						console.log(res)
+						if (res.needAuthorization) {
+							// 需要弹出隐私协议
+							this.init()
+						}
+					},
+					fail: () => {}
+				})
+			}
+		},
 		methods: {
 
 			//初始化
@@ -74,10 +90,10 @@
 			// 同意
 			handleAgreePrivacyAuthorization() {
 				// 告知平台用户已经同意，参数传同意按钮的id
-				this.resolvePrivacyAuthorization({
-					buttonId: 'agree-btn',
-					event: 'agree'
-				})
+				// this.resolvePrivacyAuthorization({
+				// 	buttonId: 'agree-btn',
+				// 	event: 'agree'
+				// })
 				this.$refs.popup.close()
 			}
 		}

config.js

@@ -7,17 +7,17 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
 const config = {
 	dev : {
 		// baseUrl : 'http://8.138.162.67:8000/a-notice-api',
-		baseUrl : 'http://h5.xzaiyp.top/a-notice-api',
+		baseUrl : 'http://h5.xzaiyp.top/cheer-admin',
 	},
 	prod : {
-		baseUrl : 'http://admin.anqi.shop/a-notice-api',
+		baseUrl : 'https://cheer-admin.xzaiyp.top/cheer-admin',
 	}
 }
 

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "unapp模板",
-    "appid" : "__UNI__07DB806",
+    "appid" : "__UNI__02A377E",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3c24e397e3b132ea",
+        "appid" : "wxe337e285c449abfc",
         "setting" : {
             "urlCheck" : false
         },

pages/center/center.vue

@@ -2,7 +2,7 @@
 	<view class="">
 		<uni-nav-bar dark :fixed="true" background-color="#00aaff" :border="false" status-bar title="个人中心" />
 		<view class="content">
-			<view class="topBox">
+			<!-- <view class="topBox">
 				<view class="users">
 					<view class="u-top" v-if="userInfo.appletOpenid">
 						<image class="img" :src="userInfo.headImage" mode="widthFix"></image>
@@ -10,7 +10,30 @@
 							{{ userInfo.nickName }}
 						</view>
 					</view>
-					<view class="u-top" v-else>
+					<view class="u-top" v-else
+					@click="">
+						<image class="img"
+							src="https://img2.baidu.com/it/u=2953585264,744730101&fm=253&fmt=auto&app=138&f=JPEG?w=360&h=360"
+							mode="widthFix"></image>
+						<view class="tit">
+							登录 / 注册
+						</view>
+					</view>
+				</view>
+			</view> -->
+			<view class="topBox">
+				<view class="users">
+					<view class="u-top" 
+					@click="$utils.navigateTo('/login/wxUserInfo')"
+					v-if="userInfo.appletOpenid">
+						<image class="img" :src="userInfo.headImage" mode="widthFix"></image>
+						<view class="tit">
+							{{ userInfo.nickName }}
+						</view>
+					</view>
+					<view class="u-top" 
+					v-else
+					@click="$utils.navigateTo('/login/login')">
 						<image class="img"
 							src="https://img2.baidu.com/it/u=2953585264,744730101&fm=253&fmt=auto&app=138&f=JPEG?w=360&h=360"
 							mode="widthFix"></image>
@@ -36,6 +59,7 @@
 								<view class="money-detail">
 									<view class="unie">￥</view>
 									<view class="number">{{ item.price }}</view>
+									<view class="oldPrice">{{ item.oldPrice }}</view>
 								</view>
 							</div>
 						</view>
@@ -71,8 +95,8 @@
 		onShow() {
 			if (uni.getStorageSync('token')) {
 				this.$store.commit('getUserInfo')
+				this.getOrderList()
 			}
-			this.getOrderList()
 		},
 		//滚动到屏幕底部
 		onReachBottom() {
@@ -219,6 +243,12 @@
 		align-items: center;
 		margin-top: 20rpx;
 	}
+	
+	.oldPrice{
+		margin-left: 10rpx;
+		color: #757575;
+		text-decoration: line-through;
+	}
 
 	.money-detail .unit {
 		font-size: 34rpx;

pages/login/login.vue

@@ -4,12 +4,12 @@
 			<!-- <image src="/static/image/login/logo.png" mode=""></image> -->
 		</view>
 		<view class="title">
-			欢迎使用xx加油
+			欢迎使用车队佳油
 		</view>
 		<view class="btn mt">
-			<view class="icon">
-				<!-- <image src="/static/image/login/wx.png" mode=""></image> -->
-			</view>
+			<!-- <view class="icon">
+				<image src="/static/image/login/wx.png" mode=""></image>
+			</view> -->
 			<view class=""
 			@click="wxLogin">
 				微信授权登录

pages/login/wxUserInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="login">
 		<view class="title">
-			帧视界
+			车队佳油
 		</view>
 		<view class="title">
 			申请获取你的头像、昵称
@@ -76,7 +76,9 @@
 						
 						self.$api('infoUpdateInfo', self.userInfo, res => {
 							if (res.code == 200) {
-								uni.navigateBack(-1)
+								uni.switchTab({
+									url:'/pages/center/center'
+								})
 							}
 						})
 					})

pages/payment/payment.vue

@@ -16,7 +16,7 @@
 			<uni-section title="输入金额" type="line" titleFontSize="34rpx"></uni-section>
 			<view class="money-input">
 				<image src="/static/payment/money.png" mode="widthFix"></image>
-				<input v-model="form.money" @focus="focus" placeholder="请输入加油金额" type="number" />
+				<input v-model="form.money" @focus="focus" placeholder="请输入加油金额" type="digit" />
 			</view>
 
 			<view v-if="form.money" class="tip">
@@ -65,7 +65,7 @@
 					money: ''
 				},
 				resolvePrivacyAuthorization: {},
-				currentIndex: 0,
+				currentIndex: -1,
 				content: [{
 					iconPath: '/static/payment/wedding-celebration.png',
 					text: '婚庆服务',
@@ -79,14 +79,14 @@
 			}
 		},
 		onShow() {
-			if (wx.onNeedPrivacyAuthorization) {
-				console.log('onNeedPrivacyAuthorization');
-				wx.onNeedPrivacyAuthorization(resolve => {
-					console.log('onNeedPrivacyAuthorization');
-					this.resolvePrivacyAuthorization = resolve
-					this.$refs.showPrivacy.init(resolve)
-				})
-			}
+			// if (wx.onNeedPrivacyAuthorization) {
+			// 	console.log('onNeedPrivacyAuthorization');
+			// 	wx.onNeedPrivacyAuthorization(resolve => {
+			// 		console.log('onNeedPrivacyAuthorization');
+			// 		this.resolvePrivacyAuthorization = resolve
+			// 		this.$refs.showPrivacy.init(resolve)
+			// 	})
+			// }
 			// wx.getPrivacySetting({
 			// 	success: res => {
 			// 		console.log(res)
@@ -127,7 +127,21 @@
 						url: '/pages/login/login'
 					})
 				}
-				this.$api('createOrderPay', this.form, res => {
+				let money = (this.form.money *
+					(this.configList.preferential ?
+					this.configList.preferential.keyCentent
+					: 1)).toFixed(2)
+				
+				// if(!money){
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: ''
+				// 	})
+				// }
+				
+				this.$api('createOrderPay', {
+					money
+				}, res => {
 					this.form.money = ''
 					if(res.code == 200){
 						uni.requestPayment({
@@ -157,7 +171,7 @@
 						// 	title: '支付成功'
 						// });
 					}
-				})
+				}, "订单创建中...")
 			},
 			
 			//获取充值套餐

store/store.js

@@ -39,6 +39,9 @@ const store = new Vuex.Store({
 			})
 		},
 		login(state) {
+			uni.showLoading({
+				title:"登录中..."
+			})
 			uni.login({
 				success(res) {
 					console.log(res);
@@ -48,6 +51,7 @@ const store = new Vuex.Store({
 					api('loginLogin', {
 						code: res.code
 					}, res => {
+						uni.hideLoading()
 						if (res.code != 200) {
 							return
 						}
@@ -69,6 +73,7 @@ const store = new Vuex.Store({
 				},
 				fail(err) {
 					console.error(err)
+					uni.hideLoading()
 				}
 			})
 		},