代码优化，解决冲突

scan/manifest.json

 {
-    "name" : "短剧",
+    "name" : "全能扫描MAX",
     "appid" : "__UNI__8514F1E",
     "description" : "",
     "versionName" : "1.0.0",

scan/pages.json

@@ -58,8 +58,8 @@
 		"pages": [{
 			"path": "vipPay/vipPay",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "会员",
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "VIP会员",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}

scan/pages/my/my.vue

@@ -38,6 +38,10 @@
 			<view class="item arrow" @click="handlePayRecord">
 				我的订单
 				<view class="item_bd ellipsis" style="margin-left: 58rpx;"></view>
+			</view>
+			<view class="item arrow" @click="handleDoc">
+				历史记录
+				<view class="item_bd ellipsis" style="margin-left: 58rpx;"></view>
 			</view>
 			<view class="item arrow" @click="handlePhone">
 				联系客服
@@ -85,6 +89,11 @@
 			},
 			handlePayRecord() {
 				navigateTo(`/pagesD/payRecord/payRecord`)
+			},
+			handleDoc() {
+				uni.switchTab({
+				    url: '/pages/doc/doc'
+				});
 			},
 			handleVipPay() {
 				navigateTo(`/pagesA/vipPay/vipPay`)

scan/pagesA/vipPay/vipPay.vue

@@ -29,11 +29,20 @@
 				</view>
 			</view>
 
+			<view class="item-agree">
+				<image style="width:28rpx;height: 28rpx;" v-if="needClick" @click="clickAgreeBtn"
+					src="@/static/ic_vip_enable.png">
+				</image>
+				<image style="width:28rpx;height: 28rpx;" v-else @click="clickAgreeBtn" src="@/static/ic_vip_none.png">
+				</image>
+				<view style="font-size: 22rpx;margin-left: 10rpx;" @click="clickAgree">点击购买即表示您同意《会员付费协议》</view>
+			</view>
+
 			<view class="section">
 				<button class="apply-button" @click="handlePay">立即开通</button>
 			</view>
 
-			<image style="width: 100%;"
+			<image @click="handlePay" style="width: 100%;"
 				src="https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg_scan/img/bg_vip_about.png" mode="widthFix" />
 
 		</scroll-view>
@@ -42,7 +51,6 @@
 
 <script>
 	import common from '@/mixins/common';
-
 	import {
 		message,
 		navigateBack,
@@ -58,6 +66,7 @@
 		data() {
 			return {
 				vipList: [],
+				needClick: false,
 				selectedIndex: 0,
 			}
 		},
@@ -73,10 +82,22 @@
 					}
 				});
 			},
+			clickAgreeBtn() {
+				this.needClick = !this.needClick
+			},
 			choosePack(item, index) {
 				this.selectedIndex = index;
 			},
+			clickAgree() {
+				let url = 'https://mints-web.mints-id.com/agreements/anythingscan/gmxy.html';
+				navigateTo(`/pages/brower/brower?url=` + url);
+			},
 			handlePay() {
+				if (!this.needClick) {
+					message.notify('请勾选会员付费协议');
+					return
+				}
+
 				let that = this;
 				let vipBean = this.vipList[this.selectedIndex];
 
@@ -98,10 +119,10 @@
 					// 调用统一收单交易创建接口（alipay.trade.create），获得返回字段支付宝交易号 trade_no
 					tradeNO: '201711152100110410533667792',
 					success: res => {
-						message.notify('支付成功');
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 1500);
+						message.notify('支付成功');
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 1000);
 					},
 					fail: error => {
 						message.notify('支付失败');
@@ -206,5 +227,14 @@
 				margin: 30rpx auto;
 			}
 		}
+
+		.item-agree {
+			width: 100%;
+			display: flex;
+			justify-content: center;
+			flex-direction: row;
+			margin: 0 auto;
+			margin-top: 16rpx;
+		}
 	}
 </style>
\ No newline at end of file