Prechádzať zdrojové kódy

Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

guhongwei 2 rokov pred
rodič
commit
fa559ba5c8

+ 1 - 0
pages/home/index.vue

@@ -419,6 +419,7 @@
 							.money_2 {
 								font-size: 12px;
 								margin: 0 0 0 2vw;
+								color: var(--f99Color);
 
 								text {
 									text-decoration: line-through;

+ 16 - 5
pagesHome/order/appraise.vue

@@ -35,16 +35,17 @@
 								<view class="stars">
 									<uni-rate size="18" :readonly="true" :value="item.goods_score" />
 								</view>
-								<view class="other1">{{item.reply[0].content||'暂无'}}</view>
+								<view class="other1"><text>{{item.reply[0].content||'暂无'}}</text></view>
 								<view class="other2">规格:{{item.goodsSpec.name}}</view>
 								<view class="other2" v-for="(itm, indexx) in item.reply" :key="indexx">
-									<view class="reply">
+									<view :class="[item.customer._id!=user._id?'reply_2':'reply']">
 										<text>用户评论:{{itm.content||'暂无'}}</text>
 										<text v-if="itm.reply">商家回复:{{itm.reply||'暂无'}}</text>
 									</view>
-									<view @tap="toReply(item)">回复</view>
+									<view v-if="item.customer._id==user._id" @tap="toReply(item)">回复</view>
 								</view>
-								<input v-if="reply.reply" @confirm="confirm" class="input" placeholder="回复商家" />
+								<uni-easyinput v-if="reply.reply" class="input" maxlength=-1 type="textarea"
+									@change="confirm" placeholder="回复商家" />
 							</view>
 						</view>
 					</view>
@@ -107,7 +108,7 @@
 				const that = this;
 				let reply = that.reply
 				let obj = {
-					content: e.detail.value,
+					content: e,
 					time: moment().format('YYYY-MM-DD HH:mm:ss')
 				}
 				reply.reply.push(obj)
@@ -328,6 +329,8 @@
 
 					.other1 {
 						margin: 1vw 0 0 0;
+						word-break: break-all;
+						word-wrap: break-word;
 					}
 
 					.flie {
@@ -353,6 +356,14 @@
 							display: flex;
 							flex-direction: column;
 							width: 70vw;
+							word-wrap: break-word;
+							word-break: break-all;
+						}
+						.reply_2{
+							display: flex;
+							flex-direction: column;
+							word-wrap: break-word;
+							word-break: break-all;
 						}
 					}
 				}

+ 1 - 1
pagesMy/order/appraise.vue

@@ -4,7 +4,7 @@
 			<view class="one">
 				<uni-forms ref="form" :modelValue="form" :rules="rules" label-width="auto">
 					<uni-forms-item label="评论内容" name="content">
-						<uni-easyinput type="textarea" v-model="form.content" placeholder="请输入评论内容" />
+						<uni-easyinput maxlength=-1 type="textarea" v-model="form.content" placeholder="请输入评论内容" />
 					</uni-forms-item>
 					<uni-forms-item label="上传评论图片" name="file">
 						<upload :list="file" name="file" :count="6" @uplSuc="uplSuc" @uplDel="uplDel"></upload>