增加协议

pageC/accountSetup/accountSetup.vue

@@ -64,7 +64,10 @@
     </view>
 
     <view class="set-bottom">
-      <view class="text-1">
+      <view
+        class="text-1"
+        @click="toNextPage(`/pageD/userAgreement/userAgreement`)"
+      >
         <text>{{ i18n.user }}</text>
         <image
           src="../../static/mine/325.png"
@@ -83,15 +86,21 @@
           mode=""
         ></image>
       </view>
-      <view class="text-1">
+      <!-- <view
+        class="text-1"
+        @click="toNextPage(`/pageD/platformProducts/platformProducts`)"
+      >
         <text>{{ i18n.platform }}</text>
         <image
           src="../../static/mine/325.png"
           class="right-icon"
           mode=""
         ></image>
-      </view>
-      <view class="text-2">
+      </view> -->
+      <view
+        class="text-2"
+        @click="toNextPage(`/pageD/joinPlatfrom/joinPlatfrom`)"
+      >
         <text>{{ i18n.merchant }}</text>
         <image
           src="../../static/mine/325.png"

pageC/ensureExplain/ensureExplain.vue

@@ -1,44 +1,37 @@
 <template>
-	<view class="page">
-		本活动为好车主会员福利，会员每日可进入活动页面进行九宫格抽奖，每日登陆可获取等级匹配的基础抽奖次数，分享链接、好友打开链接、好友注册还可分别增加一次抽奖机会。
-		<view >
-			1、每日登陆获取的基础抽奖次数由会员等级决定，等级越高，抽奖次数越多(黄铜每日1次，白银、黄金铂金每日2次，钻石、黑钻每日3次)。
-		</view>
-		<view >
-			2、会员还可通过分享链接、好友打开链接、好友注册动作，额外增加一次抽奖机会。
-		</view>
-		<view >
-			3、赢取的奖励需在有效期内使用，活动奖励以活动页面显示为准。兑换详情请参考奖品兑换页，逾期未使用，视为放弃兑奖资格，奖品自动失效不再补发，且不予延期。
-		</view>
-		<view>
-			4、在参与活动过程中，如用户出现或涉嫌违法违规行为(例如洗钱、虚假交易、作弊、套现、赌博、作弊或刷信用、其他风险交易等)，一经发现，好车主有权撤销用户活动参与资格和奖励使用资格，并有权回收用户已获得的奖励权益(包括已消费部分)。
-		</view>
-		<view >
-			5、好车主有权根据国家法律法规/监管规定/国家政策/市场风险/运营策略的变化，调整或变更本活动的运营规则亦或是提前终止本活动(如有)。相关变动或调整将公布在活动页面上，或以短信、页面消息、公告等合适的方式及时通知。如用户仍继续参与活动的，视为接受调整后的活动规则。
-		</view>
-	</view>
+  <view class="page">
+    <u-parse :content="agreementContent.content_cn"></u-parse>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
+export default {
+  data() {
+    return {
+      agreementContent: "",
+    };
+  },
+  methods: {
+    getAgreementContent() {
+      uni.$u.http.get(`/api/agreement?code=margin_rule`).then((res) => {
+        console.log(res);
+        this.agreementContent = res;
+      });
+    },
+  },
+  mounted() {
+    this.getAgreementContent();
+  },
+};
 </script>
 
 <style>
-	.page{
-		width: 94vw;
-		background-color: #fff;
-		padding: 0 24rpx;
-		font-size: 28rpx;
-		color: #222;
-		opacity: 0.6;
-	}
+.page {
+  width: 94vw;
+  background-color: #fff;
+  padding: 0 24rpx;
+  font-size: 28rpx;
+  color: #222;
+  opacity: 0.6;
+}
 </style>

pageC/privacyPolicy/privacyPolicy.vue

@@ -1,32 +1,33 @@
 <template>
-	<view>
-		隐私政策
-	</view>
+  <view v-html="agreement"> </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		computed:{
-			i18n(){
-				return this.$t("index")
-			}
-		},
-		methods: {
-			
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title:this.i18n.privacy
-			})
-		}
-	}
+export default {
+  data() {
+    return {
+      agreement: "",
+    };
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    getAgreement() {
+      uni.$u.http.get(`/api/agreement?code=private`).then((res) => {
+        this.agreement = res.content_cn;
+      });
+    },
+  },
+  mounted() {
+    this.getAgreement();
+    uni.setNavigationBarTitle({
+      title: this.i18n.privacy,
+    });
+  },
+};
 </script>
 
-<style>
-
-</style>
+<style></style>

pageD/joinPlatfrom/joinPlatfrom.vue

@@ -0,0 +1,30 @@
+<template>
+  <view>
+    <u-parse :content="agreement"></u-parse>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      agreement: "",
+    };
+  },
+  methods: {
+    getAgreement() {
+      uni.$u.http.get(`/api/agreement?code=entry_agreement`).then((res) => {
+        this.agreement = res.content_cn;
+      });
+    },
+  },
+  mounted() {
+    this.getAgreement();
+    uni.setNavigationBarTitle({
+      title: "用户入驻申请协议",
+    });
+  },
+};
+</script>
+
+<style></style>

pageD/orderInformation/orderInformation.vue

@@ -65,10 +65,10 @@
         <text class="_text-1">需付款</text>
         <view class="price">
           <text style="font-size: 20rpx">￥</text>
-          <text>{{ orderInformation.actual_price.split(".")[0] }}</text
+          <text>{{ orderInformation.estimated_price.split(".")[0] }}</text
           >.
           <text style="font-size: 20rpx">{{
-            orderInformation.actual_price.split(".")[1]
+            orderInformation.estimated_price.split(".")[1]
           }}</text>
         </view>
       </view>

pageD/productDetails/productDetails.vue

@@ -51,29 +51,31 @@
       </view>
     </view>
     <image class="goods-img" :src="commodityDetail.image" mode=""></image>
-    <view class="price" v-if="commodityDetail.discount_price">
-      <text style="font-size: 20rpx">折扣价</text>
-      <text style="font-size: 18rpx">￥</text>
-      <text style="font-size: 36rpx; font-weight: 600">{{
-        commodityDetail.discount_price.split(".")[0]
-      }}</text
-      >.
-      <text style="font-size: 18rpx">{{
-        commodityDetail.discount_price.split(".")[1]
-      }}</text>
+    <view class="title-price" style="">
+      <view class="price" v-if="commodityDetail.discount_price">
+        <text style="font-size: 20rpx">折扣价</text>
+        <text style="font-size: 18rpx">￥</text>
+        <text style="font-size: 36rpx; font-weight: 600">{{
+          commodityDetail.discount_price.split(".")[0]
+        }}</text
+        >.
+        <text style="font-size: 18rpx">{{
+          commodityDetail.discount_price.split(".")[1]
+        }}</text>
 
-      <text
-        style="
-          font-size: 24rpx;
-          color: #ccc;
-          text-decoration-line: line-through;
-        "
-      >
-        ￥{{ commodityDetail.price }}
-      </text>
-    </view>
-    <view class="goods-title">
-      {{ commodityDetail.name_cn }}
+        <text
+          style="
+            font-size: 24rpx;
+            color: #ccc;
+            text-decoration-line: line-through;
+          "
+        >
+          ￥{{ commodityDetail.price }}
+        </text>
+      </view>
+      <view class="goods-title">
+        {{ commodityDetail.name_cn }}
+      </view>
     </view>
 
     <view class="goods-detail" id="product-detail"> 商品详情 </view>
@@ -236,7 +238,7 @@ export default {
 
 <style lang="scss" scoped>
 .page {
-  background-color: #fff;
+  //background-color: #fff;
   padding-bottom: 150rpx;
   margin-top: 174rpx;
   .u-top {
@@ -283,10 +285,19 @@ export default {
     width: 100%;
     height: 750rpx;
   }
+  .title-price {
+    background-color: #fff;
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 16rpx;
+    padding-bottom: 36rpx;
+    margin-top: 20rpx;
+    padding-top: 10rpx;
+  }
 
   .price {
     color: #f83224;
-    margin-top: 36rpx;
+    margin-top: 6rpx;
     padding-left: 40rpx;
     font-weight: 600;
   }
@@ -299,12 +310,21 @@ export default {
 
   .goods-detail {
     font-size: 28rpx;
-    margin-top: 84rpx;
     padding-left: 40rpx;
+    background-color: #fff;
+    width: 90%;
+    margin: 0 auto;
+    margin-top: 40rpx;
+    border-radius: 16rpx 16rpx 0 0;
+    padding-top: 30rpx;
   }
 
   .detail {
     padding: 24rpx 20rpx;
+    background-color: #fff;
+    width: 90%;
+    margin: 0 auto;
+    border-radius: 0 0 16rpx 16rpx;
 
     .detail-img {
       width: 100%;

pageD/settleIn/settleIn.vue

@@ -81,8 +81,10 @@
       >
         <u-radio name="name" @change="radioChange" activeColor="red"> </u-radio>
       </u-radio-group>
-      我已阅读并同意<text style="color: #f83224">《用户服务协议》</text>和
-      <text style="color: #f83224">《隐私政策》</text>
+      我已阅读并同意<text style="color: #f83224" @click="toUserAgreement"
+        >《用户服务协议》</text
+      >和
+      <text style="color: #f83224" @click="toPrivacy">《隐私政策》</text>
     </view>
     <button class="btn" @click="submit">开始人脸识别验证</button>
   </view>
@@ -148,6 +150,16 @@ export default {
       });
     },
     getTeamStatus() {},
+    toPrivacy() {
+      uni.navigateTo({
+        url: "/pageC/privacyPolicy/privacyPolicy",
+      });
+    },
+    toUserAgreement() {
+      uni.navigateTo({
+        url: "/pageD/userAgreement/userAgreement",
+      });
+    },
   },
   mounted() {
     this.getTeamStatus();

pageD/userAgreement/userAgreement.vue

@@ -0,0 +1,28 @@
+<template>
+  <u-parse :content="agreemaent"></u-parse>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      agreemaent: "",
+    };
+  },
+  methods: {
+    getAgree() {
+      uni.$u.http.get(`/api/agreement?code=user`).then((res) => {
+        this.agreemaent = res.content_cn;
+      });
+    },
+  },
+  mounted() {
+    uni.setNavigationBarTitle({
+      title: "用户协议",
+    });
+    this.getAgree();
+  },
+};
+</script>
+
+<style></style>

pages.json

@@ -647,6 +647,20 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "userAgreement/userAgreement",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "joinPlatfrom/joinPlatfrom",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]

unpackage/dist/build/mp-weixin/pageB/delivery.json

@@ -8,6 +8,7 @@
     "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
     "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox",
     "u-popup": "/uview-ui/components/u-popup/u-popup",
-    "kj-flow": "/components/kj-flow/kj-flow"
+    "kj-flow": "/components/kj-flow/kj-flow",
+    "u-parse": "/uview-ui/components/u-parse/u-parse"
   }
 }

unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.wxss

@@ -1 +1 @@
-.page.data-v-b51c2260{padding:20rpx 24rpx}.page .content.data-v-b51c2260{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-b51c2260{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-b51c2260{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-b51c2260{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-b51c2260{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-b51c2260{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-b51c2260{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-b51c2260{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-b51c2260{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-b51c2260{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}
+.page.data-v-7ae6b909{padding:20rpx 24rpx}.page .content.data-v-7ae6b909{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-7ae6b909{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-7ae6b909{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-7ae6b909{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-7ae6b909{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-7ae6b909{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-7ae6b909{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-7ae6b909{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-7ae6b909{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-7ae6b909{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}

unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }