解决冲突，代码合并

pages/news1/feedback.vue

@@ -41,8 +41,8 @@
 						<u-input v-model="form.shopText" placeholder="请选择门店" type="select" @click="typeShow = true" />
 						<!-- <u-action-sheet :list="shopList" :cancel-btn="false" v-model="typeShow"
 							@click="actionSheetCallback"></u-action-sheet> -->
-						<u-picker :range="shopList" range-key="text" @confirm="actionSheetCallback($event)" v-model="typeShow"
-							mode="selector"></u-picker>
+						<u-picker :range="shopList" range-key="text" @confirm="actionSheetCallback($event)"
+							v-model="typeShow" mode="selector"></u-picker>
 					</u-form-item>
 					<u-form-item label="投诉内容" required label-width="150" label-position="top">
 						<u-input v-model="form.comment" height="228" class="realAddr" placeholder="请填写投诉内容"
@@ -79,7 +79,7 @@
 			</view>
 
 		</view>
-		<view class="section2" v-if="OrderType == 1 && feedBackList.length > 0">
+		<view class="section2" v-if="OrderType != 0 && feedBackList.length > 0">
 			<view class="feedShow" v-for="(item, index) in feedBackList" :key="index">
 				<view class="feedbackItem">
 					<view class="feedbackContent">
@@ -105,14 +105,17 @@
 							close-text="展开">
 							<rich-text :nodes="item.content"></rich-text>
 						</u-read-more>
+						<view class="timefb" v-if="OrderType == 1">
+							<text>反馈人：</text> {{ item.user_name }}
+						</view>
 						<view class="timefb">
-							{{ item.created_at }}
+							<text>反馈时间：</text> {{ item.created_at }}
 						</view>
 
 					</view>
 					<view class="feedbackResult" v-if="item.status">
 						<u-collapse>
-							<u-collapse-item :open="true" title="处理结果">
+							<u-collapse-item :open="false" title="处理结果">
 								<u-form :model="item" ref="item" class="selfForm">
 									<u-form-item label="处理时间:" label-width="150" prop="time">
 										{{ item.replay_at }}
@@ -127,7 +130,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="section2" v-if="OrderType == 2 && feedBackList.length > 0">
+		<!-- <view class="section2" v-if="OrderType == 2 && feedBackList.length > 0">
 			<view class="feedShow" style="padding: 0;" v-for="(item, index) in feedBackList" :key="index">
 				<view class="feedbackResult">
 					<u-collapse>
@@ -144,7 +147,7 @@
 					</u-collapse>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="empty" v-if="OrderType != 0 && total == 0">
 			<u-empty text="暂无信息" mode="list"></u-empty>
 		</view>
@@ -564,7 +567,6 @@ page {
 				.fbFlag {
 					background: #FFFFFF;
 					border-radius: 3px; 
-					opacity: 1;
 					padding: 5rpx;
 					border: 1px solid #FF4D4D;
 					font-size: 26rpx;
@@ -572,6 +574,7 @@ page {
 					font-weight: 500;
 					color: #FF4D4D;
 					flex-shrink: 1;
+					margin-right: 20rpx;
 				}
 
 				.fbFlag2 {
@@ -592,7 +595,6 @@ page {
 					text-overflow: ellipsis;
 					color: #000;
 					font-weight: bold; 
-					margin-left: 20rpx;
 				}
 
 			}

pages/news1/setting.vue

@@ -30,12 +30,7 @@
 				<view class="name-text">
 					手机号
 				</view>
-				<input type="number" v-model="info.mobile" placeholder="请输入手机号">
-
-				<!-- <view>
-					<text>{{ info.mobile }}</text>
-					<u-icon style="margin-left: 5rpx; color: #8A8A8A" name="arrow-right"></u-icon>
-				</view>  -->
+				<text>{{ info.mobile }}</text>
 			</view>
 		</view>
 		<view class="box">
@@ -45,21 +40,21 @@
 				</view>
 				<u-icon style="margin-left: 5rpx; color: #8A8A8A" name="arrow-right"></u-icon>
 			</view>
-			<view class="box-avter conten-height">
+			<view class="box-avter conten-height" @click="toTextPage(1)">
 				<view class="name-text">
-					清除缓存
+					用户服务协议
 				</view>
 				<u-icon style="margin-left: 5rpx; color: #8A8A8A" name="arrow-right"></u-icon>
 			</view>
-			<view class="box-avter conten-height">
+			<view class="box-avter conten-height" @click="toTextPage(2)">
 				<view class="name-text">
-					隐私
+					隐私政策
 				</view>
 				<u-icon style="margin-left: 5rpx; color: #8A8A8A" name="arrow-right"></u-icon>
 			</view>
-			<view class="box-avter conten-height">
+			<view class="box-avter conten-height" @click="toTextPage(3)">
 				<view class="name-text">
-					关于
+					关于我们
 				</view>
 				<u-icon style="margin-left: 5rpx; color: #8A8A8A" name="arrow-right"></u-icon>
 			</view>
@@ -178,6 +173,8 @@ export default {
 					if (o.confirm) {
 						uni.removeStorage('token');
 						uni.removeStorage('userInfo');
+						uni.clearStorageSync()
+						uni.clearStorage()
 						uni.reLaunch({
 							url: '/pages/login/index'
 						})
@@ -185,9 +182,14 @@ export default {
 				}
 			});
 		},
+		toTextPage(n) {
+			uni.navigateTo({
+				url: "/pages/news1/text?pageFlag=" + n
+			})
+		},
 		bindPickerInvoice() {
 			uni.navigateTo({
-				url: "/pages/invoice/index"
+				url: "/pages/invoice/indexset"
 			})
 		},
 		bindPickerChange(e) {
@@ -254,7 +256,8 @@ page {
 	height: 114rpx;
 	border-radius: 50%;
 }
-.bottomBtn{
+
+.bottomBtn {
 	width: 100%;
 	position: fixed;
 	bottom: 0;
@@ -263,6 +266,7 @@ page {
 	z-index: 88;
 	background: #fff;
 }
+
 .submitBtn {
 	height: 88upx;
 	line-height: 88upx;