Merge commit '226a9c2b' into dev

@@ -117,7 +117,7 @@
                 <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail">
                 <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail">
                   <el-input v-model="form.invoiceEmail"/>
                   <el-input v-model="form.invoiceEmail"/>
                 </el-form-item>
                 </el-form-item>
-                <el-form-item label="备注" v-if="form.invoiceForm=='1'" prop="remarks">
+                <el-form-item label="备注"  prop="remarks">
                   <el-input  type="textarea" v-model="form.remarks"/>
                   <el-input  type="textarea" v-model="form.remarks"/>
                 </el-form-item>
                 </el-form-item>
                 <div v-if="form.invoiceForm=='3'&&form.invoiceType=='0'">
                 <div v-if="form.invoiceForm=='3'&&form.invoiceType=='0'">
@@ -389,6 +389,7 @@ function submit() {
           form.value.total = totalMoney.value
           form.value.total = totalMoney.value
           form.value.version = 2
           form.value.version = 2
           form.value.invoicePhone=paymentType.value
           form.value.invoicePhone=paymentType.value
+          if (orderType.value==6) form.value.orders=route.query.orderSn
           if (isEdit.value) {
           if (isEdit.value) {
             update()
             update()
           } else {
           } else {

@@ -46,8 +46,7 @@
               <el-col :lg="9" :md="12" :sm="12" :xs="24">
               <el-col :lg="9" :md="12" :sm="12" :xs="24">
                 <h3 class="m0">{{ b.name }}</h3>
                 <h3 class="m0">{{ b.name }}</h3>
                 <p> {{ language==0? "时间": "Event Date & Time" }}：{{
                 <p> {{ language==0? "时间": "Event Date & Time" }}：{{
-                    b.dateStr
-                  }}</p>
+                    b.dateStr }}</p>
                 <p class="common">
                 <p class="common">
                   {{ language==0?"张数":"Location"}}：{{ b.ticketNum}}{{ language==0? "张": "tickets" }}
                   {{ language==0?"张数":"Location"}}：{{ b.ticketNum}}{{ language==0? "张": "tickets" }}
                 </p>
                 </p>