Roebin преди 3 години
родител
ревизия
4059aa5424
променени са 4 файла, в които са добавени 47 реда и са изтрити 21 реда
  1. 37 18
      pages/invoice/invoicedetail.nvue
  2. 3 1
      pages/travel/submitOrder.vue
  3. 2 1
      pages/travel/travelPeople.vue
  4. 5 1
      pages/userCenter.vue

+ 37 - 18
pages/invoice/invoicedetail.nvue

xqd xqd xqd xqd
@@ -48,7 +48,7 @@
 					<u--textarea v-model="memo"
 						:customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}"
 						placeholder="无" placeholderStyle="color: #555555" height=120
-						border="none" :required="true"></u--textarea>
+						border="none" :required="true" disabled="true"></u--textarea>
 				</view>
 				
 				<view class="" v-if="state==0">
@@ -76,28 +76,34 @@
 					<u-form-item   label="邮寄地址" prop="userInfo.mail" borderBottom  ref="item1" labelWidth="160rpx" :required="true">
 						<u--input v-model="model1.userInfo.mail"  disabledColor="#ffffff" placeholder="无" placeholderStyle="color: #555555" border="none" disabled="true"></u--input>
 					</u-form-item>
+					<view class="" style="margin: 30rpx 0;">
+						<!-- <text style="color: red;">*</text> -->
+						<text>备注信息(选填)</text>
+					</view>
+					<u--textarea v-model="model1.userInfo.memo" placeholder="无"
+						:customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}"
+						placeholderStyle="color: #555555" height=120 border="none" disabled="true"></u--textarea>
 				</view>
 
-				<view class="" style="margin: 30rpx 0;">
-					<!-- <text style="color: red;">*</text> -->
-					<text>备注信息(选填)</text>
-				</view>
-				<u--textarea v-model="model1.userInfo.memo" placeholder="无"
-					:customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}"
-					placeholderStyle="color: #555555" height=120 border="none"></u--textarea>
+				
 			</u--form>
 		</view>
 		<view class="bottomall">
-			<text>开票套餐:</text>
+			<text>开票订单:</text>
 			<view  v-for="(item,index) in model1.userInfo.orders" :key="index" class="boxfls">
-				
-				<view class="bomimgbox">
-						<image :src="item.cover_picture" mode="aspectFill"></image>
+				<view style="display: flex;flex-direction: row;align-items: center;margin-bottom: 10rpx;font-size: 26rpx;">
+					<text>订单号:{{item.code}}</text>
+					<text class="copytype" @click="copyTap(item.code)">复制</text>
+				</view>
+				<view style="display: flex;flex-direction: row;">
+					<view class="bomimgbox">
+							<image :src="item.cover_picture" mode="aspectFill"></image>
+						</view>
+					<view class="goodsinfo">
+						<text style="font-size: 32rpx;">{{item.good_name}}</text>
+						<text>X{{item.number}}</text>
+						<text>¥{{item.amount}}</text>
 					</view>
-				<view class="goodsinfo">
-					<text style="font-size: 32rpx;">{{item.good_name}}</text>
-					<text>X{{item.number}}</text>
-					<text>¥{{item.amount}}</text>
 				</view>
 			</view>
 			
@@ -202,7 +208,14 @@
 					delta:1
 				})
 			},
-			
+			copyTap(code){
+				uni.setClipboardData({
+					data: code,
+					success: function () {
+					},
+					
+				});
+			}
 	    },
 	}
 </script>
@@ -220,9 +233,15 @@
 		padding: 40rpx;
 		margin-top: 10rpx;
 		font-size: 26rpx;
+		.copytype{
+			padding: 5rpx 10rpx;
+			border: 1rpx solid #000;
+			border-radius: 10rpx;
+			margin-left: 20rpx;
+		}
 		.boxfls{
 			display: flex;
-			flex-direction: row;
+			// flex-direction: row;
 			margin-top: 20rpx;
 		}
 		.bomimgbox{

+ 3 - 1
pages/travel/submitOrder.vue

xqd
@@ -77,7 +77,9 @@
 			that=this
 			// JSON.parse(val.content);
 			// console.log(options.suborder)
-			let suborder = JSON.parse(options.suborder)
+			console.log(options)
+			let sub = decodeURIComponent(options.suborder)
+			let suborder=JSON.parse(sub)
 			// this.init(suborder)
 			this.suborder = suborder
 			console.log(suborder)

+ 2 - 1
pages/travel/travelPeople.vue

xqd
@@ -404,7 +404,8 @@
 						suborder.people.push(item.name)
 					})
 					uni.navigateTo({
-						url: `/pages/travel/submitOrder?suborder=${JSON.stringify(suborder)}`
+						url: "/pages/travel/submitOrder?suborder="+encodeURIComponent(JSON.stringify(suborder))
+						// url: `/pages/travel/submitOrder?suborder=${JSON.stringify(suborder)}`
 					})
 				}).catch((err) => {
 					console.log(err)

+ 5 - 1
pages/userCenter.vue

xqd xqd
@@ -21,6 +21,7 @@
 				</view>
 				<view class="userinfo" v-if="!userMsg.nickName" @click="getUserProfile()">
 					<text>点击获取头像昵称</text>
+					<text style="padding-top: 10rpx;">{{phone}}</text>
 				</view>
 			</view>
 
@@ -308,7 +309,10 @@
 				align-items: center;
 			}
 
-			.userinfo {}
+			.userinfo {
+				display: flex;
+				flex-direction: column;
+			}
 
 			.getnewname {
 				display: flex;