c37e07b7 by zhangmeng

订单翻译

1 parent 0103405a
...@@ -40,42 +40,43 @@ ...@@ -40,42 +40,43 @@
40 </div> 40 </div>
41 <el-row style="flex: 1"> 41 <el-row style="flex: 1">
42 <div style="flex: 1"> 42 <div style="flex: 1">
43 <div style="margin-bottom: 20px;">预约日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{route.query.date}}</span></div> 43 <div style="margin-bottom: 20px;">{ language==0?'预约日期':"Appointment date" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{route.query.date}}</span></div>
44 <div>套餐名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.name }}</span></div> 44 <div>{{ language==0?'套餐名称':"Package name" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.name }}</span></div>
45 </div> 45 </div>
46 46
47 <div style="flex: 1"> 47 <div style="flex: 1">
48 <!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>--> 48 <!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>-->
49 <div style="margin-bottom: 20px">上门化妆 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.goHome==1?'是':'否' }}</span></div> 49 <div style="margin-bottom: 20px">{{ language==0?'上门化妆':'Home makeup' }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.goHome==1?'是':'否' }}</span></div>
50 <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.mealPrice:'€'+formDatas.mealPriceEn }}</span></div> 50 <div >{{ language==0?'价格':"Price" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.mealPrice:'€'+formDatas.mealPriceEn }}</span></div>
51 </div> 51 </div>
52 52
53 <div style="flex: 1"> 53 <div style="flex: 1">
54 <div style="margin-bottom: 20px">套餐说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{formDatas.introduction}}</span></div> 54 <div style="margin-bottom: 20px">{{ language==0?'套餐说明':"Package description" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{formDatas.introduction}}</span></div>
55 <!-- <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.mealPrice:'€'+formDatas.mealPriceEn }}</span></div>--> 55 <!-- <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.mealPrice:'€'+formDatas.mealPriceEn }}</span></div>-->
56 </div> 56 </div>
57 </el-row> 57 </el-row>
58 </el-row> 58 </el-row>
59 </div> 59 </div>
60 <br> 60 <br>
61 <div class="yu">预约时间</div> 61 <div class="yu">{{ language==0?'预约时间':'Appointment time' }}</div>
62 <el-row style="width: 100%" > 62 <el-row style="width: 100%" >
63 <el-button v-for="v in radioList" @click="handleRadio(v)" :disabled="v.num-v.counts<=0" class="radioBox" :class="{'radioBoxbg':v.flag}"> 63 <el-button v-for="v in radioList" @click="handleRadio(v)" :disabled="v.num-v.counts<=0" class="radioBox" :class="{'radioBoxbg':v.flag}">
64 <div> 64 <div>
65 <div>{{ v.nameStart }}-{{ v.nameEnd }}</div> 65 <div>{{ v.nameStart }}-{{ v.nameEnd }}</div>
66 <div>(剩余: <span class="sing">{{ v.num-v.counts }}</span> 个)</div> 66 <div v-if="language==0">(剩余: <span class="sing">{{ v.num-v.counts }}</span> 个)</div>
67 <div v-else>(Remaining: <span class="sing">{{ v.num-v.counts }}</span> )</div>
67 </div> 68 </div>
68 </el-button> 69 </el-button>
69 </el-row> 70 </el-row>
70 <br> 71 <br>
71 <div class="yu">预约信息</div> 72 <div class="yu">{{ language==0?'预约信息':"Reservation information" }}</div>
72 <br> 73 <br>
73 <div class="form-order"> 74 <div class="form-order">
74 <el-form :model="form" style="width: 800px" :label-width="language==0?'140px':'200px'" :rules="rules" ref="formRef"> 75 <el-form :model="form" style="width: 800px" :label-width="language==0?'140px':'200px'" :rules="rules" ref="formRef">
75 <el-form-item :label="language==0?'预约数量':'Number Of Reservations'" required prop="num"> 76 <el-form-item :label="language==0?'预约数量':'Number Of Reservations'" required prop="num">
76 <el-input-number style="width: 100%" v-model.trim="form.num" :min="1" :max="10" @change="changNum"/> 77 <el-input-number style="width: 100%" v-model.trim="form.num" :min="1" :max="10" @change="changNum"/>
77 </el-form-item> 78 </el-form-item>
78 <el-form-item :label="language==0?'预约联系人':'Appointment Contact'" required prop="contacts"> 79 <el-form-item :label="language==0?'预约联系人':'Name'" required prop="contacts">
79 <el-input v-model.trim="form.contacts" :min="1" :max="10" /> 80 <el-input v-model.trim="form.contacts" :min="1" :max="10" />
80 </el-form-item> 81 </el-form-item>
81 <el-form-item :label="language==0?'联系电话':'Contact Number'" required prop="phone"> 82 <el-form-item :label="language==0?'联系电话':'Contact Number'" required prop="phone">
......
...@@ -30,58 +30,6 @@ ...@@ -30,58 +30,6 @@
30 {{form.rearks}} 30 {{form.rearks}}
31 </el-row> 31 </el-row>
32 </el-card> 32 </el-card>
33 <!-- <el-row justify='space-between'>-->
34 <!-- <div class="img-header" style="width: 40%">-->
35 <!-- <div class="card">-->
36 <!-- <el-image style="width: 100%" :src="fillImgUrl(form.photos)?.split(',')[0]" fit="none" :preview-src-list="form.photosList"/>-->
37 <!-- </div>-->
38 <!-- </div>-->
39 <!-- <div class="img-header" style="width: 20%">-->
40 <!-- <el-row style="height: 50%;">-->
41 <!-- <el-col :span="12">-->
42 <!-- <div class="card">-->
43 <!-- <el-image :src="fillImgUrl(form.photos)?.split(',')[0] " fit="cover" :preview-src-list="form?.photos?.split(',')"/>-->
44 <!-- </div>-->
45 <!-- </el-col>-->
46 <!-- <el-col :span="12">-->
47 <!-- <div class="card">-->
48 <!-- <el-image :src="fillImgUrl(form.photos)?.split(',')[0] " fit="cover" :preview-src-list="form?.photos?.split(',')"/>-->
49 <!-- </div>-->
50 <!-- </el-col>-->
51 <!-- </el-row>-->
52 <!-- <div style="height: 50%;">-->
53 <!-- <div class="card">-->
54 <!-- <el-image :src="fillImgUrl(form.photos)?.split(',')[0] " fit="cover" :preview-src-list="form?.photos?.split(',')"/>-->
55 <!-- </div>-->
56 <!-- </div>-->
57
58 <!-- </div>-->
59 <!-- <div class="img-header" style="width: 20%">-->
60 <!-- <div class="card">-->
61 <!-- <el-image :src="fillImgUrl(form.photos)?.split(',')[0] " fit="cover" :preview-src-list="form?.photos?.split(',')"/>-->
62 <!-- </div>-->
63 <!-- </div>-->
64 <!-- <div class="img-header" style="width: 20%">-->
65 <!-- <el-row style="height: 50%">-->
66 <!-- <el-col :lg="12" :md="8" :sm="12" :xs="24" >-->
67 <!-- <div class="card">-->
68 <!-- <el-image :src="fillImgUrl(form.photos)?.split(',')[0] " fit="cover" :preview-src-list="form?.photos?.split(',')"/>-->
69 <!-- </div>-->
70 <!-- </el-col>-->
71 <!-- <el-col :span="12">-->
72 <!-- <div class="card">-->
73 <!-- <el-image :src="fillImgUrl(form.photos)?.split(',')[0] " fit="cover" :preview-src-list="form?.photos?.split(',')"/>-->
74 <!-- </div>-->
75 <!-- </el-col>-->
76 <!-- </el-row>-->
77 <!-- <div style="height: 50%;">-->
78 <!-- <div class="card">-->
79 <!-- <el-image :src="fillImgUrl(form.photos)?.split(',')[0] " fit="cover" :preview-src-list="form?.photos?.split(',')"/>-->
80 <!-- </div>-->
81 <!-- </div>-->
82 <!-- </div>-->
83 <!-- </el-row>-->
84
85 <div class="mt30"> 33 <div class="mt30">
86 <el-row :gutter="20"> 34 <el-row :gutter="20">
87 <el-col :span="10"> 35 <el-col :span="10">
...@@ -111,7 +59,6 @@ ...@@ -111,7 +59,6 @@
111 import {useRouter} from "vue-router"; 59 import {useRouter} from "vue-router";
112 import {ref, reactive, onMounted} from "vue"; 60 import {ref, reactive, onMounted} from "vue";
113 import {useRoute} from "vue-router"; 61 import {useRoute} from "vue-router";
114 import {getComShootVoById, getHotelById, getHotelRooms, getShootList} from "@/apiPc/booking"
115 import * as booking from "@/apiPc/booking" 62 import * as booking from "@/apiPc/booking"
116 import {useStorage} from "@vueuse/core/index"; 63 import {useStorage} from "@vueuse/core/index";
117 import useUserStore from "@/store/modules/user"; 64 import useUserStore from "@/store/modules/user";
...@@ -127,7 +74,6 @@ const query = ref({ ...@@ -127,7 +74,6 @@ const query = ref({
127 shootId:route.params.id 74 shootId:route.params.id
128 }) 75 })
129 const loading = ref(false) 76 const loading = ref(false)
130 const roomList = ref([])
131 const map = ref(null) 77 const map = ref(null)
132 onMounted(() => { 78 onMounted(() => {
133 getData() 79 getData()
...@@ -145,71 +91,9 @@ function getData() { ...@@ -145,71 +91,9 @@ function getData() {
145 }).catch(err => { 91 }).catch(err => {
146 console.log(err) 92 console.log(err)
147 }) 93 })
148 // query.value.hotelId = route.query.id 94
149 // getHotelRooms(query.value).then(res => {
150 // roomList.value = res.rows
151 // })
152 } 95 }
153 96
154 // function initMap() {
155 // const TMap = null
156 // var center = new TMap.LatLng(form.value.latitude, form.value.longitude);//设置中心点坐标'
157 // var map = new TMap.Map("map", {
158 // center: center,//设置地图中心点坐标
159 // zoom: 17, //设置地图缩放级别
160 // });
161 // var infoWindowLocation = new TMap.LatLng(form.value.latitude, form.value.longitude);//创建一个坐标
162 // //创建InfoWindow实例,并进行初始化
163 // var infowindow = new TMap.InfoWindow({
164 // content: form.value.address, //信息窗口内容
165 // position: infoWindowLocation,//显示信息窗口的坐标
166 // map: map,
167 // offset: {x: 0, y: -32}
168 // });
169 // infowindow.close();
170 // var marker = new TMap.MultiMarker({
171 // map: map,
172 // //样式定义
173 // styles: {
174 // "myStyle": new TMap.MarkerStyle({
175 // "anchor": {x: 16, y: 32}
176 // })
177 // },
178 // //点标记数据数组
179 // geometries: [{
180 // "id": "1", //点标记唯一标识,后续如果有删除、修改位置等操作,都需要此id
181 // // "styleId": 'myStyle', //指定样式id
182 // "position": new TMap.LatLng(form.value.latitude, form.value.longitude), //点标记坐标位置
183 // "properties": {//自定义属性
184 // "title": form.value.name
185 // }
186 // }
187 // ]
188 // })
189 // marker.on("click", function (evt) {
190 // //设置infoWindow
191 // infowindow.open(); //打开信息窗
192 // infowindow.setPosition(evt.geometry.position);//设置信息窗位置
193 // })
194 // }
195
196 // function goOrder(room) {
197 // if (!user) {
198 // useUserStore().setReLogin()
199 // return
200 // }
201 // router.push({
202 // name: 'hotelOrder',
203 // params: {
204 // roomId: room.id
205 // },
206 // query: {
207 // room: encodeURIComponent(JSON.stringify(room)),
208 // hotelName: form.value.name,
209 // checkInTime: form.value.checkInTime
210 // }
211 // })
212 // }
213 </script> 97 </script>
214 98
215 <style scoped lang="scss"> 99 <style scoped lang="scss">
......
...@@ -39,42 +39,43 @@ ...@@ -39,42 +39,43 @@
39 </div> 39 </div>
40 <el-row style="flex: 1"> 40 <el-row style="flex: 1">
41 <div style="flex: 1"> 41 <div style="flex: 1">
42 <div style="margin-bottom: 20px;">预约日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{route.query.date}}</span></div> 42 <div style="margin-bottom: 20px;">{{ language==0?'预约日期':"Appointment date" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{route.query.date}}</span></div>
43 <div>套餐名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.name }}</span></div> 43 <div>{{ language==0?'套餐名称':"Package name" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.name }}</span></div>
44 </div> 44 </div>
45 45
46 <div style="flex: 1"> 46 <div style="flex: 1">
47 <!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>--> 47 <!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>-->
48 <div style="margin-bottom: 20px;">上门摄影 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.goHome==1?'是':'否' }}</span></div> 48 <div style="margin-bottom: 20px;">{{ language==0?'上门摄影':'Door-to-door photography' }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.goHome==1?'是':'否' }}</span></div>
49 <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.photoPrice:'€'+formDatas.photoPriceEn }}</span></div> 49 <div >{{ language==0?'价格':"Price" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.photoPrice:'€'+formDatas.photoPriceEn }}</span></div>
50 </div> 50 </div>
51 51
52 <div style="flex: 1"> 52 <div style="flex: 1">
53 <div style="margin-bottom: 20px">套餐说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{formDatas.introduction}}</span></div> 53 <div style="margin-bottom: 20px">{{ language==0?'套餐说明':"Package description" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{formDatas.introduction}}</span></div>
54 <!-- <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.photoPrice:'€'+formDatas.photoPriceEn }}</span></div>--> 54 <!-- <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.photoPrice:'€'+formDatas.photoPriceEn }}</span></div>-->
55 </div> 55 </div>
56 </el-row> 56 </el-row>
57 </el-row> 57 </el-row>
58 </div> 58 </div>
59 <br> 59 <br>
60 <div class="yu">预约时间</div> 60 <div class="yu">{{ language==0?'预约时间':'Appointment time' }}</div>
61 <el-row style="width: 100%" > 61 <el-row style="width: 100%" >
62 <el-button v-for="v in radioList" @click="handleRadio(v)" :disabled="v.num-v.counts<=0" class="radioBox" :class="{'radioBoxbg':v.flag}"> 62 <el-button v-for="v in radioList" @click="handleRadio(v)" :disabled="v.num-v.counts<=0" class="radioBox" :class="{'radioBoxbg':v.flag}">
63 <div> 63 <div>
64 <div>{{ v.nameStart }}-{{ v.nameEnd }}</div> 64 <div>{{ v.nameStart }}-{{ v.nameEnd }}</div>
65 <div>(剩余: <span class="sing">{{ v.num-v.counts }}</span> 个)</div> 65 <div v-if="language==0">(剩余: <span class="sing">{{ v.num-v.counts }}</span> 个)</div>
66 <div v-else>(Remaining: <span class="sing">{{ v.num-v.counts }}</span> )</div>
66 </div> 67 </div>
67 </el-button> 68 </el-button>
68 </el-row> 69 </el-row>
69 <br> 70 <br>
70 <div class="yu">预约信息</div> 71 <div class="yu">{{ language==0?'预约信息':"Reservation information" }}</div>
71 <br> 72 <br>
72 <div class="form-order"> 73 <div class="form-order">
73 <el-form :model="form" style="width: 800px" :label-width="language==0?'140px':'200px'" :rules="rules" ref="formRef"> 74 <el-form :model="form" style="width: 800px" :label-width="language==0?'140px':'200px'" :rules="rules" ref="formRef">
74 <el-form-item :label="language==0?'预约数量':'Number Of Reservations'" required prop="num"> 75 <el-form-item :label="language==0?'预约数量':'Number Of Reservations'" required prop="num">
75 <el-input-number style="width: 100%" v-model.trim="form.num" :min="1" :max="10" @change="changNum"/> 76 <el-input-number style="width: 100%" v-model.trim="form.num" :min="1" :max="10" @change="changNum"/>
76 </el-form-item> 77 </el-form-item>
77 <el-form-item :label="language==0?'预约联系人':'Appointment Contact'" required prop="contacts"> 78 <el-form-item :label="language==0?'预约联系人':'Name'" required prop="contacts">
78 <el-input v-model.trim="form.contacts" :min="1" :max="10" /> 79 <el-input v-model.trim="form.contacts" :min="1" :max="10" />
79 </el-form-item> 80 </el-form-item>
80 <el-form-item :label="language==0?'联系电话':'Contact Number'" required prop="phone"> 81 <el-form-item :label="language==0?'联系电话':'Contact Number'" required prop="phone">
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
17 <label class="orangeTag" v-if="b.orderType == 2"> {{ language==0?'餐饮':'DINING' }} </label> 17 <label class="orangeTag" v-if="b.orderType == 2"> {{ language==0?'餐饮':'DINING' }} </label>
18 <label class="orangeTag" v-if="b.orderType == 3"> {{ language==0?'化妆':'MakeUp' }} </label> 18 <label class="orangeTag" v-if="b.orderType == 3"> {{ language==0?'化妆':'MakeUp' }} </label>
19 <label class="orangeTag" v-if="b.orderType == 4"> {{ language==0?'拍摄':'Shooting ' }} </label> 19 <label class="orangeTag" v-if="b.orderType == 4"> {{ language==0?'拍摄':'Shooting ' }} </label>
20
21 <span>{{ language==0?'订单编号:':'No.' }} {{ b.id }}</span> 20 <span>{{ language==0?'订单编号:':'No.' }} {{ b.id }}</span>
22 </div> 21 </div>
23 22
...@@ -38,7 +37,6 @@ ...@@ -38,7 +37,6 @@
38 <h3 class="name">{{b.name}}</h3> 37 <h3 class="name">{{b.name}}</h3>
39 <p v-if="language==0">{{b.messageObj?.roomStayDate}}</p> 38 <p v-if="language==0">{{b.messageObj?.roomStayDate}}</p>
40 <p v-else>{{b.messageObj?.roomStayDate.replace('共',' total ').replace('晚',' days')}}</p> 39 <p v-else>{{b.messageObj?.roomStayDate.replace('共',' total ').replace('晚',' days')}}</p>
41
42 <p>{{b.messageObj?.roomInfo}}</p> 40 <p>{{b.messageObj?.roomInfo}}</p>
43 41
44 </div> 42 </div>
...@@ -62,7 +60,7 @@ ...@@ -62,7 +60,7 @@
62 </div> 60 </div>
63 <div v-if="b.orderType==3 ||b.orderType == 4"> 61 <div v-if="b.orderType==3 ||b.orderType == 4">
64 <h3 class="name">{{b.name}}</h3> 62 <h3 class="name">{{b.name}}</h3>
65 <p v-if="language==0"> 63 <p >
66 {{dayjs(b.deliveryTime).format('YYYY-MM-DD')+' '+b.extJsonObj.timePeriod?.split('-')[0]+'-'+dayjs(b.deliveryTime).format('YYYY-MM-DD')+' '+b.extJsonObj.timePeriod?.split('-')[1] }} 64 {{dayjs(b.deliveryTime).format('YYYY-MM-DD')+' '+b.extJsonObj.timePeriod?.split('-')[0]+'-'+dayjs(b.deliveryTime).format('YYYY-MM-DD')+' '+b.extJsonObj.timePeriod?.split('-')[1] }}
67 </p> 65 </p>
68 </div> 66 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!