'0709-1856-c01'

pages/goods/detail.vue

@@ -121,6 +121,7 @@
 			
 			<view class="service-popup popup-white" v-if="otherImg.length > 0">
 				<view class="rule-content">
+					<view class="content-data" v-html="goodsData.content"></view>
 					<view class="rule-img" v-for="(item,indx) in otherImg" :key="indx">
 						<image :src="item" mode="widthFix"></image>
 					</view>

pages/service/chat/chat.vue

@@ -91,14 +91,14 @@
 		</view>
 		
 		<uni-popup ref="addresspopup" type="bottom" border-radius="10px 10px 0 0" background-color="#ffffff" :mask-click="false">
-			<view class="order-popup">
-				<view class="order-title">
-					<view class="name">补充收货地址</view>
+			<view class="order-popup address">
+				<view class="order-title bb1">
+					<view class="name">补充会员信息</view>
 					<view class="close" @click="showAddress(2)"><image src="/static/image/close.png"></image></view>
 				</view>
 				<view class="order-body">
 					<view class="form-feedbak">
-						<view class="title"><text>*</text>收件人</view>
+						<view class="title"><text>*</text>姓名</view>
 						<view class="form-textarea">
 							<input v-model="addressForm.nickname" placeholder="请输入" class="u-input" />
 						</view>
@@ -122,9 +122,9 @@
 							<input v-model="addressForm.address" placeholder="请输入" class="u-input" />
 						</view>
 					</view>
-					<view class="submit-btn">
-						<button class="btn" @click="submitForm" :loading="submitState" :disabled="submitState">{{submitState?'提交中':'提交'}}</button>
-					</view>
+				</view>
+				<view class="submit-btn">
+					<button class="btn" @click="submitForm" :loading="submitState" :disabled="submitState">{{submitState?'提交中':'提交'}}</button>
 				</view>
 			</view>
 		</uni-popup>
@@ -220,10 +220,10 @@ export default {
 			sendId:null,
 			myid:"",
 			pushObj:null,
-            // wsAuth:"https://tran.jsshuita.cn/plugin/webman/push/auth",
-            // wsUrl: 'wss://tran.jsshuita.cn/ws',
-            wsAuth:"http://127.0.0.1:9881/plugin/webman/push/auth",
-            wsUrl: 'ws://127.0.0.1:3131',
+            wsAuth:"https://tran.jsshuita.cn/plugin/webman/push/auth",
+            wsUrl: 'wss://tran.jsshuita.cn/ws',
+            // wsAuth:"http://127.0.0.1:9881/plugin/webman/push/auth",
+            // wsUrl: 'ws://127.0.0.1:3131',
 			page:2,
 			size:10,
 			orderPage:1,
@@ -295,7 +295,7 @@ export default {
 		submitForm(){
 			var formData = this.addressForm;
 			var validation = form.validation(formData,[
-				{name:"nickname",rule:["required"],msg:["请输入"]},
+				{name:"nickname",rule:["required"],msg:["请输入姓名"]},
 				{name:"mobile",rule:["required","isMobile"],msg:["请填写手机号码","手机号码格式错误"]},
 				{name:"city",rule:["required"],msg:["请选择地区"]},
 				{name:"address",rule:["required"],msg:["请输入"]},
@@ -806,9 +806,17 @@ export default {
 @import '@/static/index.scss';
 
 .order-popup .order-title{display: flex;align-items: center;justify-content: space-between;font-size: 28upx;padding: 20upx;}
+.order-popup .input-value-border{border: 0;}
+.order-popup .order-title.bb1{border-bottom: 2upx solid #efefef;}
 .order-popup .order-title image{width: 40upx;height: 40upx;}
 .order-popup .order-body{height: 40vh;overflow: auto;padding: 20upx;}
+.order-popup.address .order-body{height: 60vh;overflow: auto;padding: 20upx;}
 .view-more{text-align: center;font-size: 24upx;color: #666;padding: 20upx;}
+.order-popup .u-input {height: 60upx;}
+.order-popup .submit-btn{
+	border-top: 2upx solid #efefef;
+	border-radius: 0;
+}
 .submit-btn{
 	background-color: #fff;
 	border-radius: 20upx 0;
@@ -824,6 +832,9 @@ export default {
 	font-size: 30upx;
 	border-radius: 40upx;
 }
+.submit-btn .btn::after{
+	border: 0;
+}
 .form-feedbak{
 	background-color: #fff;
 	border-radius: 20upx;

static/js/request.js

@@ -15,8 +15,8 @@ const axg = {
 		return '/api';
 		// #endif
 		// #ifdef MP
-		// return 'https://tran.jsshuita.cn/dy'
-		return 'http://127.0.0.1:9881/dy'
+		return 'https://tran.jsshuita.cn/dy'
+		// return 'http://127.0.0.1:9881/dy'
 		// #endif
 	},
 	toast: function(text, duration, success) {