处理bug、问卷不能附加问题、小调整

main
yanzai 1 year ago
parent 9b00dc34e7
commit e6c19624b5

@ -23,7 +23,7 @@ class OrderController extends Controller
$persons_sfz = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0])->pluck('id_number')->toArray(); $persons_sfz = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0])->pluck('id_number')->toArray();
$OrderList = DB::table('orders') $OrderList = DB::table('orders')
->select('id', 'title', 'status', 'name', 'appointment_time as time', 'order_number as order','appointment_number', ->select('id', 'title', 'status', 'name','appointment_date as date', 'appointment_time as time', 'order_number as order','appointment_number',
DB::raw("CASE WHEN type = 1 THEN '个检' WHEN type = 2 THEN '团检' ELSE 'unknown' END as type"), DB::raw("CASE WHEN type = 1 THEN '个检' WHEN type = 2 THEN '团检' ELSE 'unknown' END as type"),
'price', 'true_price', 'pay_time', 'refund_time', 'created_at') 'price', 'true_price', 'pay_time', 'refund_time', 'created_at')
->where(['web_user_id' => $user->id]) ->where(['web_user_id' => $user->id])

@ -9,7 +9,7 @@
} from 'vue' } from 'vue'
import { import {
$api, $api,
$response, $response,
} from '@/api' } from '@/api'
import { import {
onShow, onShow,

@ -137,7 +137,7 @@
<view>扫码预约取号</view> <view>扫码预约取号</view>
<w-qrcode :options="{ <w-qrcode :options="{
level: 4, level: 4,
size: 500, size: 460,
code: show_erweima_text, code: show_erweima_text,
}"></w-qrcode> }"></w-qrcode>
</view> </view>
@ -162,9 +162,8 @@
</view> </view>
<view class="order_info_line_wrapper"> <view class="order_info_line_wrapper">
<view class="order_info_line_label_wrapper">预约时间</view> <view class="order_info_line_label_wrapper">预约时间</view>
<view class="order_info_line_value_wrapper">{{ <view class="order_info_line_value_wrapper">
order_info.time {{order_info.date}} {{order_info.time.substring(',',5)}}</view>
}}</view>
</view> </view>
</view> </view>
<view v-if="order_info.status==2 || order_info.status==4" > <view v-if="order_info.status==2 || order_info.status==4" >
@ -193,7 +192,7 @@
<text v-if="[2, 4].includes(order_info.status)"></text> <text v-if="[2, 4].includes(order_info.status)"></text>
<text v-if="[5].includes(order_info.status)">退</text> <text v-if="[5].includes(order_info.status)">退</text>
<text class="price_true" <text class="price_true"
v-if="order_info.true_price !== order_info.price">(测试:{{ order_info.true_price }})</text> v-if="order_info.true_price !== order_info.price">(实付:{{ order_info.true_price }})</text>
<text class="price_text">{{ order_info.price }}</text> <text class="price_text">{{ order_info.price }}</text>
</view> </view>
<view class="order_line_wrapper"></view> <view class="order_line_wrapper"></view>

@ -61,6 +61,7 @@ const getmyddcSelect = async () => {
const getContent = (item) => { const getContent = (item) => {
// / // /
console.log('--------',item)
let contentArr = item?.content.map((val) => { let contentArr = item?.content.map((val) => {
if (val.includes("{{MORE}}")) { if (val.includes("{{MORE}}")) {
let valParse = val.split("{{MORE}}"); let valParse = val.split("{{MORE}}");
@ -72,6 +73,7 @@ const getContent = (item) => {
} }
return { text: val, value: val, isInput: "" }; return { text: val, value: val, isInput: "" };
}); });
return contentArr; return contentArr;
}; };
@ -350,7 +352,7 @@ onShow(() => {
topicList[topicIndex].answer.includes(val.value) topicList[topicIndex].answer.includes(val.value)
" "
v-model="topicList[topicIndex].more[index]" v-model="topicList[topicIndex].more[index]"
:placeholder="getContent()[index]?.isInput" :placeholder="getContent(topicList[topicIndex])[index]?.isInput"
/> />
</view> </view>
</view> </view>

Loading…
Cancel
Save