no message

.env.js

@@ -3,8 +3,8 @@ let ENV_CONFIG = null;
 
 if (nodeEnv === 'development') {
     //开发环境
-    ENV_CONFIG = require('.env.prod.js');
-	// ENV_CONFIG = require('.env.dev.js');
+    // ENV_CONFIG = require('.env.prod.js');
+	ENV_CONFIG = require('.env.dev.js');
 } else {
     //生产环境
     ENV_CONFIG = require('.env.prod.js');

api/groupOrder.js

@@ -15,4 +15,6 @@ export const groupOrderList = (data) => request(newsUrlTwo + 'list', 'post', { .
 // 获取订单详情
 export const groupOrderInfo = (data) => request(newsUrlTwo + 'info', 'post', { ...data },false)
 // 获取订单状态
-export const groupOrderStatus = (data) => request(newsUrlTwo + 'status', 'post', { ...data },false)
+export const groupOrderStatus = (data) => request(newsUrlTwo + 'status', 'post', { ...data },false)
+// 回显上传订单用户信息
+export const groupOrderFoster = (data) => request(newsUrlTwo + 'foster', 'post', { ...data },false)

api/ticketOrder.js

@@ -6,4 +6,6 @@ export const ticketOrderList = (data) => request(newsUrl + 'list', 'post', { ...
 // 获取订单详情
 export const ticketOrderInfo = (data) => request(newsUrl + 'info', 'post', { ...data },false)
 // 获取订单状态
-export const ticketOrderStatus = (data) => request(newsUrl + 'status', 'post', { ...data },false)
+export const ticketOrderStatus = (data) => request(newsUrl + 'status', 'post', { ...data },false)
+// 回显订单用户信息
+export const ticketOrderFoster = (data) => request(newsUrl + 'foster', 'post', { ...data },false)

manifest.json

@@ -99,7 +99,7 @@
             "https" : false,
             "proxy" : {
                 "/api" : {
-                    "target" : "https://userapi.sjzkeji.com",
+                    "target" : "https://test-userapi.sjzkeji.com",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

pages-buy/save-order.vue

@@ -2,7 +2,6 @@
 	<view class="save-order-box iPhone-bottom flex-common-css box-border-box">
 		<view class="bg-box"></view>
 		<Nav title='提交订单' bgckgroundBox='transparent'></Nav>
-
 		<view class="scroll-view-css box-border-box p-24">
 			<view class="box-card box-border-box mb-20 bgc-f">
 				<view class="box-input align-items-center box-border-box p-b-20 mb-20">
@@ -12,7 +11,6 @@
 				<view class="box-input align-items-center box-border-box p-b-20 mb-20">
 					<view class="fs-28 fw-600 w158">手机号</view>
 					<input v-model="fromData.phone" type="number" placeholder="请输入手机号">
-
 				</view>
 				<view class="box-input align-items-center box-border-box p-b-20 mb-20">
 					<view class="fs-28 fw-600 w158">验证码</view>
@@ -24,7 +22,6 @@
 					<input v-model="fromData.address" type="text" placeholder="请输入联系地址（选填）">
 				</view>
 			</view>
-
 			<view class="box-card box-border-box mb-20 bgc-f">
 				<view class="box-top box-border-box flex-justify-space">
 					<view class="box-left display-flex">
@@ -45,12 +42,10 @@
 					<span class="fs-44 fc-0 fw-b">{{goodsData.deposit||'0'}}</span>
 				</view>
 			</view>
-
 			<view class="box-card box-border-box mb-20 bgc-f flex-justify-space">
 				<view class="fs-28 fw-600 w158">备注</view>
 				<input v-model="fromData.note" class="text-align-right" type="text" placeholder="请填写你的备注">
 			</view>
-
 			<view class="box-card box-border-box mb-20 bgc-f flex-justify-space">
 				<view class="fs-28 fw-600 w158">支付方式</view>
 				<view class="wx-box display-flex">
@@ -59,7 +54,6 @@
 				</view>
 			</view>
 		</view>
-
 		<view class="bottom-box box-border-box p-24">
 			<view class="flex-justify-space">
 				<view class="align-items-flex-end box-1">
@@ -78,7 +72,8 @@
 	} from '@/api/common.js';
 	import {
 		groupPay,
-		groupCreate
+		groupCreate,
+		groupOrderFoster
 	} from '@/api/groupOrder.js';
 	import tools from "@/service/tools";
 
@@ -87,7 +82,6 @@
 			return {
 				isCode: false,
 				codeText: '获取验证码',
-
 				fromData: {
 					name: '',
 					id: '',
@@ -107,15 +101,26 @@
 				let obj = JSON.parse(decodeURIComponent(e.goodsData));
 				this.goodsData = obj;
 				this.fromData.id = obj.id;
-				console.log(this.goodsData, '*********');
 			}
 		},
+		mounted() {
+			this.getfromData()
+		},
 		methods: {
+			getfromData() {
+				groupOrderFoster().then((res) => {
+					if (res.code == 1) {
+						console.log(res);
+						this.fromData.address = res.data.address
+						this.fromData.name = res.data.name
+						this.fromData.phone = res.data.phone
+					}
+				})
+			},
 			getCode() {
 				if (!this.fromData.phone) {
 					return tools.error('请输入手机号')
 				}
-
 				if (this.isCode) {
 					return
 				}
@@ -168,7 +173,7 @@
 											uni.switchTab({
 												url: "/pages/order/index"
 											})
-										}, 1000) 
+										}, 1000)
 									},
 									fail: (err) => {
 										this.isAJAX = false;

pages-buy/save-ticket.vue

@@ -47,7 +47,8 @@
 				<view class="box-buttom text-align-right">
 					<span class="fs-28 fc-9 fw-400">共{{fromData.number}}件，</span>
 					<span class="fs-28 fc-0 fw-400">合计￥</span>
-					<span class="fs-44 fc-0 fw-b">{{goodsData.price?(Number(goodsData.price)*fromData.number).toFixed(2):''}}</span>
+					<span
+						class="fs-44 fc-0 fw-b">{{goodsData.price?(Number(goodsData.price)*fromData.number).toFixed(2):''}}</span>
 				</view>
 			</view>
 
@@ -79,6 +80,9 @@
 </template>
 
 <script>
+	import {
+		ticketOrderFoster
+	} from '@/api/ticket.js'
 	import {
 		getCode
 	} from '@/api/common.js'
@@ -93,7 +97,6 @@
 			return {
 				isCode: false,
 				codeText: '获取验证码',
-
 				fromData: {
 					name: '',
 					id: '',
@@ -116,7 +119,20 @@
 				this.fromData.id = obj.id;
 			}
 		},
+		mounted() {
+			this.ticketOrderFoster()
+		},
 		methods: {
+			ticketOrderFoster() {
+				ticketOrderFoster().then((res) => {
+					if (res.code == 1) {
+						console.log(res);
+						this.fromData.address = res.data.address
+						this.fromData.name = res.data.name
+						this.fromData.phone = res.data.phone
+					}
+				})
+			},
 			getCode() {
 				if (this.isCode) {
 					return

pages-buy/ticket-det.vue

@@ -11,7 +11,7 @@
 				</template>
 			</Nav>
 		</view>
-		
+
 		<view class="scroll-view-css">
 			<swiper class="swiper " circular :autoplay="true" :interval="3000" :duration="500" @change="onSwiperChange">
 				<swiper-item v-for="(item,i) in obj.image" :key="i">
@@ -19,7 +19,7 @@
 					<view class="swiper-num fc-f">{{BanenerCurrent}}/{{obj.image.length}}</view>
 				</swiper-item>
 			</swiper>
-			
+
 			<view class="box-border-box p-24">
 				<view class="box-card box-border-box p-24">
 					<view class="mb-12">
@@ -29,15 +29,16 @@
 					<view class="fs-36 fw-600">{{obj.title||''}}</view>
 				</view>
 			</view>
-			
+
 			<image class="pwxq" src="@/static/img/buy/pwxq.png" mode="scaleToFill"></image>
-			
-			<view class="box-border-box plr-24">
-				<view class="box-card box-border-box p-24 fs-30 fc-0" v-html="obj.content"></view>
+
+			<view class="box-border-box richText plr-24">
+				<!-- <view class="box-card box-border-box p-24 fs-30 fc-0" v-html="obj.content"></view> -->
+				<rich-text :nodes="obj.content"></rich-text>
 			</view>
 		</view>
-		
-		<view class="bottom-box box-border-box p-24" >
+
+		<view class="bottom-box box-border-box p-24">
 			<view class="flex-justify-space">
 				<view class="align-items-flex-end box-1">
 					<span class="fs-28 fc-f fw-600">￥</span>
@@ -50,51 +51,58 @@
 </template>
 
 <script>
-	import {ticketInfo} from '@/api/ticket.js';
+	import {
+		ticketInfo
+	} from '@/api/ticket.js';
 	import tools from "@/service/tools";
 	export default {
-		data(){
-			return{
-				BanenerCurrent:1,
-				id:"",
-				obj:{
-					image:[],
+		data() {
+			return {
+				BanenerCurrent: 1,
+				id: "",
+				obj: {
+					image: [],
 				},
 			}
 		},
 		onLoad(e) {
-			if(e.id){
+			if (e.id) {
 				this.id = e.id;
 				this.getInfo();
 			}
 		},
-		methods:{
-			getInfo(){
-				ticketInfo({id:this.id}).then((res)=>{
-					if(res.code === 1){
+		methods: {
+			getInfo() {
+				ticketInfo({
+					id: this.id
+				}).then((res) => {
+					if (res.code === 1) {
 						this.obj = res.data;
+						let zfc = res.data.content
+						let a = zfc.replace(/font color="#c24f4a"/g, "p style='color:#c24f4a'")
+						this.obj.content = a.replace(/\font/g, "\p")
 					}
 				})
 			},
-			lookImg(list,i){
-				tools.lookBigImg(i,list);
+			lookImg(list, i) {
+				tools.lookBigImg(i, list);
 			},
-			toBack(){
+			toBack() {
 				tools.leftClick()
 			},
-			onSwiperChange(e){
+			onSwiperChange(e) {
 				this.BanenerCurrent = (e.detail.current + 1);
 			},
-			toSave(){
-				if(!this.isTimeEnd){
+			toSave() {
+				if (!this.isTimeEnd) {
 					let goodsData = {
-						title:this.obj.title,
-						cover_img:this.obj.cover_img,
-						price:this.obj.price,
-						id:this.obj.id,
+						title: this.obj.title,
+						cover_img: this.obj.cover_img,
+						price: this.obj.price,
+						id: this.obj.id,
 					}
 					uni.navigateTo({
-						url:'/pages-buy/save-ticket?goodsData=' + encodeURIComponent(JSON.stringify(goodsData))
+						url: '/pages-buy/save-ticket?goodsData=' + encodeURIComponent(JSON.stringify(goodsData))
 					})
 				}
 			},
@@ -103,11 +111,17 @@
 </script>
 
 <style scoped lang="scss">
-	.ticket-det-box{
+	::deep .richText p {
+		color: red;
+	}
+
+	.ticket-det-box {
 		position: relative;
-		.nav-box{
+
+		.nav-box {
 			position: absolute;
-			.yuan-bg{
+
+			.yuan-bg {
 				width: 60rpx;
 				height: 60rpx;
 				background-color: #B3B3B4;
@@ -116,8 +130,9 @@
 				line-height: 62rpx;
 			}
 		}
-		.bottom-box{
-			.box-1{
+
+		.bottom-box {
+			.box-1 {
 				flex: 1;
 				height: 100rpx;
 				background: #333333;
@@ -126,7 +141,8 @@
 				padding-left: 32rpx;
 				padding-bottom: 20rpx;
 			}
-			.box-2{
+
+			.box-2 {
 				width: 200rpx;
 				height: 100rpx;
 				line-height: 100rpx;
@@ -135,33 +151,38 @@
 				text-align: center;
 			}
 		}
-		.swiper{
+
+		.swiper {
 			width: 100%;
 			height: 750rpx;
 			position: relative;
-			.swiper-item{
+
+			.swiper-item {
 				width: 100%;
 				height: 750rpx;
 			}
-			.swiper-num{
+
+			.swiper-num {
 				position: absolute;
 				right: 24rpx;
 				bottom: 24rpx;
 				width: 120rpx;
 				height: 48rpx;
-				background: rgba(51,51,51,0.6);
+				background: rgba(51, 51, 51, 0.6);
 				border-radius: 200rpx;
 				text-align: center;
 				line-height: 48rpx;
 			}
 		}
-		.box-card{
+
+		.box-card {
 			width: 100%;
 			min-height: 100rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
 		}
-		.pwxq{
+
+		.pwxq {
 			width: 146rpx;
 			height: 46rpx;
 			margin: 38rpx auto 24rpx auto;