zhangyan
/
hainan_2024_zhenghe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问卷相关、bug等

Browse Source
main
yanzai 9 months ago
parent 231ade07c9
commit b4d15e91fe
8 changed files with 93 additions and 14 deletions
Show Stats Download Patch File Download Diff File

13
Laravel/app/Http/Controllers/API/Admin/QuestionnaireController.php
Unescape Escape View File

@ -14,6 +14,9 @@ class QuestionnaireController extends Controller
$name = $request->post('name'); $name = $request->post('name');
$items = $request->post('items'); $items = $request->post('items');
$questions = $request->post('questions'); $questions = $request->post('questions');
$jichu_combo_id = $request->post('jichu_combo');
$tuijian_combo_id = $request->post('tuijian_combo');
$gaoduan_combo_id = $request->post('gaoduan_combo');
if (!$name) { if (!$name) {
return \Yz::echoError('请填写问卷名称'); return \Yz::echoError('请填写问卷名称');
} }
@ -28,6 +31,9 @@ class QuestionnaireController extends Controller
'type' => $type, 'type' => $type,
'name' => $name, 'name' => $name,
'items' => $items ?? '[]', 'items' => $items ?? '[]',
'jichu_combo' => $jichu_combo_id,
'tuijian_combo' => $tuijian_combo_id,
'gaoduan_combo' => $gaoduan_combo_id,
'questions' => $questions ?? '[]', 'questions' => $questions ?? '[]',
'created_at' => date('Y-m-d H:i:s'), 'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'),
@ -41,6 +47,10 @@ class QuestionnaireController extends Controller
$type = $request->post('type'); $type = $request->post('type');
$name = $request->post('name'); $name = $request->post('name');
$items = $request->post('items'); $items = $request->post('items');
$jichu_combo_id = $request->post('jichu_combo');
$tuijian_combo_id = $request->post('tuijian_combo');
$gaoduan_combo_id = $request->post('gaoduan_combo');
$questions = $request->post('questions'); $questions = $request->post('questions');
if (!$name) { if (!$name) {
return \Yz::echoError('请填写问卷名称'); return \Yz::echoError('请填写问卷名称');
@ -56,6 +66,9 @@ class QuestionnaireController extends Controller
'type' => $type, 'type' => $type,
'name' => $name, 'name' => $name,
'items' => $items ?? '[]', 'items' => $items ?? '[]',
'jichu_combo' => $jichu_combo_id,
'tuijian_combo' => $tuijian_combo_id,
'gaoduan_combo' => $gaoduan_combo_id,
'questions' => $questions ?? '[]', 'questions' => $questions ?? '[]',
'updated_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'),
]); ]);

7
Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
Unescape Escape View File

@ -181,7 +181,12 @@ class ComboController extends Controller
return \Yz::Return(true, "查询完成", ['list' => $list, 'count' => $count]); return \Yz::Return(true, "查询完成", ['list' => $list, 'count' => $count]);
} }
public function GetAllList(){ public function GetAllList(){
$list = DB::table('combos')->get(); $status = request('status');
$list = DB::table('combos');
if(isset($status) and $status=='enable'){
$list = $list->where(['status'=>1]);
}
$list = $list->get();
return \Yz::Return(true, "查询完成", ['list' => $list]); return \Yz::Return(true, "查询完成", ['list' => $list]);
} }

8
Laravel/app/Http/Controllers/API/H5/OrderController.php
Unescape Escape View File

@ -287,10 +287,10 @@ class OrderController extends Controller
]; ];
} }
} }
if (isset($wj_flag) and $wj_flag == 1) { // if (isset($wj_flag) and $wj_flag == 1) {
$item_price = $item_price * $wj_zhekou; // $item_price = $item_price * $wj_zhekou;
} // }
$item_price = $item_price * config('app.globals.ZiXuan_ZheKou'); //所有自选项目打8折
$price += $item_price; $price += $item_price;
$missingIds = array_diff($item_ids, $existingIds); $missingIds = array_diff($item_ids, $existingIds);

36
Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php
Unescape Escape View File

@ -204,22 +204,52 @@ class QuestionnairesLogsController extends Controller
} }
$type = $question_info->type; $type = $question_info->type;
$items = json_decode($question_info->items, true); $items = json_decode($question_info->items, true);
//获取绑定套餐的id
$jichu_combo_new = (isset($question_info->jichu_combo) and !empty($question_info->jichu_combo))?$question_info->jichu_combo:0;
$tuijian_combo_new = (isset($question_info->tuijian_combo) and !empty($question_info->tuijian_combo))?$question_info->tuijian_combo:0;
$gaoduan_combo_new = (isset($question_info->gaoduan_combo) and !empty($question_info->gaoduan_combo))?$question_info->gaoduan_combo:0;
//获取套餐的项目
$jichu_items_ids = [];
if ($jichu_combo_new) {
$jichu_combo_items = DB::table('combo_items')->where('combo_id', $jichu_combo_new)->get();
foreach ($jichu_combo_items as $key => $value) {
$jichu_items_ids[]=$value->item_id;
}
}
$tuijian_items_ids = [];
if ($tuijian_combo_new) {
$tuijian_combo_items = DB::table('combo_items')->where('combo_id', $tuijian_combo_new)->get();
foreach ($tuijian_combo_items as $key => $value) {
$tuijian_items_ids[]=$value->item_id;
}
}
$gaoduan_items_ids = [];
if ($gaoduan_combo_new) {
$gaoduan_combo_items = DB::table('combo_items')->where('combo_id', $gaoduan_combo_new)->get();
foreach ($gaoduan_combo_items as $key => $value) {
$gaoduan_items_ids[]=$value->item_id;
}
}
$check_items = []; $check_items = [];
$check_items_array = [ $check_items_array = [
'jichu' => [ 'jichu' => [
'combo' => '0', 'combo' => '0',
'combo_items' => [], 'combo_items' => [],
'items' => [] 'jichu' => $jichu_combo_new,
'items' => $jichu_items_ids
], ],
'tuijian' => [ 'tuijian' => [
'combo' => '0', 'combo' => '0',
'combo_items' => [], 'combo_items' => [],
'items' => [] 'jichu' => $jichu_combo_new,
'items' =>$tuijian_items_ids
], ],
'gaoduan' => [ 'gaoduan' => [
'combo' => '0', 'combo' => '0',
'combo_items' => [], 'combo_items' => [],
'items' => [] 'jichu' => $jichu_combo_new,
'items' => $gaoduan_items_ids
], ],
]; ];
$question_ids = []; $question_ids = [];

33
admin/src/views/Question/Question.vue
Unescape Escape View File

@ -14,7 +14,8 @@ import {
QuestionDeleteAction, QuestionDeleteAction,
QuestionListAction, QuestionListAction,
QuestionItemItemAction, QuestionItemItemAction,
QuestionQuestionSelectAction QuestionQuestionSelectAction,
ComboGetAllList
} from '@/api/api.js' } from '@/api/api.js'
const default_page_options = { const default_page_options = {
@ -75,7 +76,16 @@ const routerChange = (query) => {
} }
QuestionList() QuestionList()
} }
//获取可用套餐列表
let combolist=ref([]);
const GetCombolist = async () => {
const response = await ComboGetAllList({status:"enable"})
if (response.status) {
combolist.value=response.data.list
} else {
ElMessage.error(response.msg)
}
}
const searchClick = (page = 1) => { const searchClick = (page = 1) => {
page_options.value.page = page page_options.value.page = page
$router.push({ $router.push({
@ -189,6 +199,7 @@ onMounted(() => {
routerChange($router.currentRoute.value.query) routerChange($router.currentRoute.value.query)
QuestionItemItem() QuestionItemItem()
QuestionQuestionSelect() QuestionQuestionSelect()
GetCombolist()
}) })
</script> </script>
<template> <template>
@ -234,6 +245,24 @@ onMounted(() => {
<span style="margin-right: 10px;">{{ edit_data.items.length }} 个关联项目</span> <span style="margin-right: 10px;">{{ edit_data.items.length }} 个关联项目</span>
<el-button type="primary" size="small" @click="editItemClick()">编辑项目</el-button> <el-button type="primary" size="small" @click="editItemClick()">编辑项目</el-button>
</el-form-item> </el-form-item>
<el-form-item label="基础">
<el-select v-model="edit_data.jichu_combo"
placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name" :value="item.combo_id" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="推荐">
<el-select v-model="edit_data.tuijian_combo"
placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name" :value="item.combo_id" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="高端">
<el-select v-model="edit_data.gaoduan_combo"
placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name" :value="item.combo_id" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="题目"> <el-form-item label="题目">
<div class="question_edit_title_wrapper"> <div class="question_edit_title_wrapper">
<el-select style="width: 300px;margin-right: 10px;" v-model="edit_question_active" <el-select style="width: 300px;margin-right: 10px;" v-model="edit_question_active"

4
h5/config.js
Unescape Escape View File

@ -1,7 +1,7 @@
const app_type = 'gzh' const app_type = 'gzh'
//const base_url = "https://api.hainan2024.sa0.online" //开发环境 //const base_url = "https://api.hainan2024.sa0.online" //开发环境
const base_url="https://tj-h5.hnxdfe.com" //正式环境 //const base_url="https://tj-h5.hnxdfe.com" //正式环境
//const base_url="http://124.225.137.54:39081" //测试环境 const base_url="http://124.225.137.54:39081" //测试环境
const config = { const config = {
api_map_url: base_url + '/api/ApiMap/h5', api_map_url: base_url + '/api/ApiMap/h5',
base_assets_url: base_url, base_assets_url: base_url,

4
h5/pages/main/question/info/info.vue
Unescape Escape View File

@ -127,7 +127,7 @@
</view> </view>
</view> </view>
<view v-if="Number(question_info.check_items_array.tuijian.combo) !== 0" class="items_item_wrapper"> <view v-if="Number(question_info.check_items_array.tuijian.combo) !== 0 || question_info.check_items_array.jichu!==0" class="items_item_wrapper">
<view class="items_title_wrapper"> <view class="items_title_wrapper">
<view class="items_title_text_wrapper">中等推荐方案</view> <view class="items_title_text_wrapper">中等推荐方案</view>
<view class="items_title_count_wrapper"> <view class="items_title_count_wrapper">
@ -150,7 +150,7 @@
</view> </view>
</view> </view>
<view v-if="Number(question_info.check_items_array.gaoduan.combo) !== 0" class="items_item_wrapper"> <view v-if="Number(question_info.check_items_array.gaoduan.combo) !== 0 || question_info.check_items_array.jichu!==0" class="items_item_wrapper">
<view class="items_title_wrapper"> <view class="items_title_wrapper">
<view class="items_title_text_wrapper">高端推荐方案</view> <view class="items_title_text_wrapper">高端推荐方案</view>
<view class="items_title_count_wrapper"> <view class="items_title_count_wrapper">

2
h5/pages/main/yytjsj/yytjsj_new.vue
Unescape Escape View File

@ -1,4 +1,5 @@
<template> <template>
<DraggableButton />
<view class="ctime_main"> <view class="ctime_main">
<uni-popup ref="YuYuePopupRef" style="z-index: 999;"> <uni-popup ref="YuYuePopupRef" style="z-index: 999;">
<view class="tishi_main"> <view class="tishi_main">
@ -92,6 +93,7 @@
onShow, onShow,
onLoad onLoad
} from "@dcloudio/uni-app"; } from "@dcloudio/uni-app";
import DraggableButton from "@/pages/components/goHome.vue";
import WeeklyCalendar from '@/common/WeeklyCalendar.vue'; import WeeklyCalendar from '@/common/WeeklyCalendar.vue';
let nmr_date = ref(null); let nmr_date = ref(null);
let nmr_time = ref(null); let nmr_time = ref(null);

Write Preview
Loading…
Cancel
Save