协议

api/groupon.js

@@ -1,5 +1,10 @@
 import request from "@/utils/request.js";
 
+//获取协议
+export function getNoticeByType(type) {
+    return request.get("/v1/getNoticeByType?type=" +type,null);
+}
+
 
 //获取用户售后详情
 export function getUserAfterSalesDetail(afterSalesId) {

pages/columnGoods/HotNewGoods/feedback.vue

@@ -21,6 +21,12 @@
 				</view>
 			</view>
 		</view>
+		<view class="inputPhone flex-row justify-start">
+			<text class="info" selectable="false" space="false" decode="false">
+				电话号码：
+			</text>
+			<input class="input " type="number"  placeholder="请输入您的电话号码" v-model="param.phone" />
+		</view>
 		<view class="sub_btn" @click="subMit">
 			<button class='modifyBnt' >提交</button>
 		</view>
@@ -37,7 +43,8 @@ export default {
 			param:{
 				type:1,
 				content:'',
-				imgUrl:''
+				imgUrl:'',
+				phone:''
 			},
 		}
 	},
@@ -80,7 +87,6 @@ export default {
 			}).catch(err =>{
 				uni.$u.toast(err)
 			})
-
 		}
 	}
 }
@@ -124,7 +130,7 @@ export default {
 height: 44rpx;
 font-size: 28rpx;
 font-weight: 400;
-color: #999999;
+/*color: #999999;*/
 line-height: 44rpx;
 }
 .modifyBnt {
@@ -140,4 +146,10 @@ line-height: 44rpx;
 	text-align: center;
 	line-height: 84rpx;
 }
+	.inputPhone{
+		margin-top: 20rpx;
+	}
+	.input{
+		border: 1px solid rgba(238, 238, 238, 1);
+	}
 </style>

pages/groupbuying/privacyAgreement/index.rpx.css

@@ -1,5 +1,5 @@
 .scroll-y{
-    height: 100%;
+    height: 95%;
     overflow: hidden;
 
 }

pages/groupbuying/privacyAgreement/privacyAgreement.vue

@@ -1,14 +1,17 @@
 <template>
 	<view class="page   flex-col" :style="{'height':height}">
 		<scroll-view scroll-y="true" class="scroll-y">
-			<view class="content-box  flex-col">
-				<web-view  src="http://www.gzqcdj.cn/doc/1.html"></web-view>
+			<view class="content-box flex-col">
+<!--				<web-view  src="http://www.gzqcdj.cn/doc/1.html"></web-view>-->
+				<rich-text v-html="notice.content">
+				</rich-text>
 			</view>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import {getNoticeByType} from '@/api/groupon.js'
 	export default {
 		data() {
 			return {
@@ -20,14 +23,16 @@
 			let sysInfo = uni.getSystemInfoSync();
 			this.height = sysInfo.windowHeight - sysInfo.windowBottom  + 'px';
 			console.log("获取到的高度", this.height)
+			this.getNoticeByType();
 
-			// uni.setNavigationBarTitle({
-			// 	title: '新的标题'
-			// });
 		},
 		methods: {
 
-
+			getNoticeByType(){
+				getNoticeByType(3).then(res =>{
+					this.notice = res.data
+				})
+			}
 
 		},
 	};

pages/groupbuying/userAgreement/index.rpx.css

@@ -1,5 +1,5 @@
 .scroll-y{
-    height: 100%;
+    height: 95%;
     overflow: hidden;
 
 }

pages/groupbuying/userAgreement/userAgreement.vue

@@ -2,13 +2,16 @@
 	<view class="page   flex-col" :style="{'height':height}">
 		<scroll-view scroll-y="true" class="scroll-y" >
 			<view class="content-box  flex-col">
-				<web-view  src="http://www.gzqcdj.cn/doc/2.html"></web-view>
+<!--				<web-view  src="http://www.gzqcdj.cn/doc/2.html"></web-view>-->
+				<rich-text v-html="notice.content">
+				</rich-text>
 			</view>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import {getNoticeByType} from '@/api/groupon.js'
 	export default {
 		data() {
 			return {
@@ -20,10 +23,15 @@
 			let sysInfo=uni.getSystemInfoSync();
 			this.height= sysInfo.windowHeight - sysInfo.windowBottom +'px';
 			console.log("获取到的高度",this.height)
+			this.getNoticeByType();
 		},
 
 		methods: {
-
+			getNoticeByType(){
+				getNoticeByType(2).then(res =>{
+					this.notice = res.data
+				})
+			}
 
 
 		},

pages/points_mall/user_address.vue

@@ -4,23 +4,16 @@
 			<view class='line'>
 				<image src='@/static/images/line.jpg' v-if="addressList.length"></image>
 			</view>
-			<radio-group class="radio-group" @change="radioChange" v-if="addressList.length">
+			<radio-group class="radio-group"  @change="radioChange" v-if="addressList.length">
 				<view class='item' v-for="(item,index) in addressList" :key="index">
 					<view class='address'>
 						<view class='consignee'>{{$t(`收货人`)}}：{{item.realName}}<text class='phone'>{{item.phone}}</text></view>
 						<view>{{$t(`收货地址`)}}：{{item.province}}{{item.city}}{{item.district}}{{item.detail}}</view>
 					</view>
 					<view class='operation acea-row row-between-wrapper'>
-						<!-- #ifndef MP -->
-						<radio class="radio" :value="index.toString()" :checked="item.defaultState ===2">
-							<text>{{$t(`设为默认`)}}</text>
+						<radio class="radio"  :value="index" :checked="item.defaultState ===2">
+							<text>设为默认</text>
 						</radio>
-						<!-- #endif -->
-						<!-- #ifdef MP -->
-						<radio class="radio" :value="index" :checked="item.defaultState ===2">
-							<text>{{$t(`设为默认`)}}</text>
-						</radio>
-						<!-- #endif -->
 						<view class='acea-row row-middle'>
 							<view @click='editAddress(item.id)'><text class='iconfont icon-bianji'></text>{{$t(`编辑`)}}</view>
 							<view @click='delAddress(index)'><text class='iconfont icon-shanchu'></text>{{$t(`删除`)}}</view>
@@ -446,4 +439,8 @@
 	.address-management .footer .addressBnt.wxbnt {
 		background-color: #fe960f;
 	}
+	.bg-color{
+		background-color: #B42A3E !important;
+	}
+
 </style>

pages/user/index.vue

@@ -170,7 +170,7 @@
 							<navigator url="/pages/points_mall/user_address" hover-class="none">
 								<u-cell isLink>
 									<view slot="title" class="u-slot-title">
-										<image src="http://www.gzzzyd.com/groupon/regiment/编组 8@2x(1).png" mode=""></image>
+										<image src="/static/images/addressIcon.png" mode=""></image>
 										<text class="u-cell-text">地址管理</text>
 									</view>
 								</u-cell>
@@ -346,7 +346,7 @@
 							<navigator url="/pages/points_mall/user_address" hover-class="none">
 								<u-cell isLink>
 									<view slot="title" class="u-slot-title">
-										<image src="http://www.gzzzyd.com/groupon/regiment/编组 8@2x(1).png" mode=""></image>
+										<image src="/static/images/addressIcon.png" mode=""></image>
 										<text class="u-cell-text">地址管理</text>
 									</view>
 								</u-cell>

pages/users/user_address/index.vue

@@ -33,7 +33,7 @@
 				</view>
 				<view class='default acea-row row-middle' @click='ChangeIsDefault'>
 					<checkbox-group>
-						<checkbox :checked="userAddress.defaultState                                                        ? true : false" />{{ $t(`设置为默认地址`) }}
+						<checkbox   :checked="userAddress.defaultState ? true : false" />{{ $t(`设置为默认地址`) }}
 					</checkbox-group>
 				</view>
 
@@ -244,7 +244,7 @@ export default {
 			this.$set(this.multiArray, 1, multiArray[1]);
 			this.$set(this.multiArray, 2, multiArray[2]);
 			// #endif
-			// #ifdef H5 
+			// #ifdef H5
 			this.multiArray = multiArray;
 			// #endif
 
@@ -431,7 +431,7 @@ export default {
 		},
 		/**
 		 * 提交用户添加地址
-		 * 
+		 *
 		 */
 		formSubmit: function (e) {
 			let that = this,
@@ -611,4 +611,7 @@ export default {
 	color: var(--view-theme);
 	border: 1px solid var(--view-theme);
 }
+	.bg-color{
+		background-color: #B42A3E !important;
+	}
 </style>