Commit 60bdae5b56f9928982f16094c2b0adbaf1b85cc0

Authored by 杨鑫
1 parent bde1e631

'最新'

lvdao-miniapp/utils/request.js
... ... @@ -16,18 +16,18 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
16 16 if(baseUrl == 1){
17 17 // bases = 'http://8.130.38.56:8027/admin-server' + url;
18 18 // bases = 'http://172.16.61.125:9003' + url;
19   - bases = 'http://192.168.2.152:9003' + url;
  19 + // bases = 'http://192.168.2.152:9003' + url;
20 20 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
21   - // bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
  21 + bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
22 22  
23 23  
24 24 }else{
25 25 // bases = 'http://8.130.38.56:8027/business-server' + url;
26 26 // bases = 'http://172.16.61.48/business-server' + url;
27 27 // bases = 'http://172.16.61.125:9004' + url;
28   - bases = 'http://192.168.2.152:9004' + url;
  28 + // bases = 'http://192.168.2.152:9004' + url;
29 29 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
30   - // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
  30 + bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
31 31  
32 32 }
33 33 var token = uni.getStorageSync('token') || '';
... ...
wenjuan-h5/pages_category_page1/question/question.vue
... ... @@ -80,7 +80,7 @@
80 80 <view v-else-if="item.layoutType == 2" class="myMultiple">
81 81 <div v-for="(val, index) in item.options"
82 82 :class="['myOption gary', { optionActive: val.disabled == true }]" :key="index"
83   - @click="chooseAnswerMore(val, index)">
  83 + @click="chooseAnswerMore(val,index,item)">
84 84 <p class="chooseTag" v-if="val.disabled == true"><u-icon name="checkbox-mark"
85 85 color="#fff" size="8pt"></u-icon></p>
86 86 {{ val.answer }}
... ... @@ -276,6 +276,7 @@
276 276 this.wenjuan.question = JSON.parse(res.data.question)
277 277 //检查this.wenjuan.question这个list的每个里面是否有maxChoose参数,没有的话就加一个
278 278 this.wenjuan.question.forEach(item => {
  279 + console.log(item)
279 280 if (!item.maxChoose) {
280 281 item.maxChoose = 0
281 282 }
... ... @@ -734,8 +735,6 @@
734 735 this.wenjuan.question[key].choose = chooseItem.answer
735 736 }
736 737 })
737   -
738   -
739 738 }
740 739  
741 740 this.myChoose = {
... ... @@ -743,8 +742,21 @@
743 742 }
744 743 chooseItem.disabled = true
745 744 },
746   - chooseAnswerMore(chooseItem, idx) {
747   -
  745 + chooseAnswerMore(chooseItem, idx,item) {
  746 + console.log(chooseItem, idx,item)
  747 + if (item.maxChoose && item.maxChoose > 0) {
  748 + // 获取当前题目的已选中选项数量
  749 + const selectedCount = item.options.filter(option => option.disabled).length;
  750 + // 如果已选中到达 maxChoose,并且当前项未被选中,则不允许选择
  751 + if (selectedCount >= item.maxChoose && !chooseItem.disabled) {
  752 + uni.showToast({
  753 + title: `最多只能选择 ${item.maxChoose} 个选项`,
  754 + icon: 'none',
  755 + duration: 2000
  756 + });
  757 + return;
  758 + }
  759 + }
748 760 if(chooseItem.disabled){
749 761 chooseItem.disabled=false
750 762 for (let key in this.wenjuan.question) {
... ...