guzijian / garbage-removal · Commits

Commit 08664d9e494a3b8822325c569191daf4b75c3871

Authored by guzijian
1 parent b4a8b373

feat: 下单修改

Inline Side-by-side
Showing 2 changed files with 81 additions and 55 deletions
garbage-removal/src/pages/home/clean/index.vue
  View file @08664d9
... ... @@ -7,10 +7,9 @@
7 7 <u-picker closeOnClickOverlay :show="garbageTypeShowFlag" :columns="garbageTypeList" :itemHeight="100"
8 8 @confirm="handlePickerGarbageTypeConfirm" @close="handleGarbageTypeClick(false)"
9 9 @cancel="handleGarbageTypeClick(false)"></u-picker>
10   - <u-popup :zIndex="10074" closeOnClickOverlay :show="carPopupShowFlag" :round="10" @close="handlePopupClick(false)"
  10 + <!-- <u-popup :zIndex="10074" closeOnClickOverlay :show="carPopupShowFlag" :round="10" @close="handlePopupClick(false)"
11 11 @open="handlePopupClick(true)">
12 12 <view class="company-clean-container-car-popup">
13   - <!-- 主要内容 -->
14 13 <view class="company-clean-container-car-popup-content">
15 14 <view class="company-clean-container-car-popup-content-title">
16 15 <view style="text-align: center;">
... ... @@ -28,15 +27,13 @@
28 27 v-model="garCarInfoList[item.garOrderCarType].garOrderCarNumber" :disabledInput="true"></u-number-box>
29 28 </view>
30 29 </view>
31   -
32 30 </view>
33 31 </view>
34   - <!-- 占位盒子 -->
35 32 <view class="company-clean-container-car-popup-button-safe">
36 33 &nbsp;
37 34 </view>
38 35 </view>
39   - </u-popup>
  36 + </u-popup> -->
40 37 </view>
41 38 <view class="company-clean-container">
42 39 <view class="company-clean-container-box">
... ... @@ -59,19 +56,8 @@
59 56 </view>
60 57 <view class="company-clean-container-car-main">
61 58 <view class="company-clean-container-car-main-content">
62   - <view v-if="paramFrom.carType" class="company-clean-container-car-main-content-type">
63   - <view class="company-clean-container-car-main-content-type-price-area">
64   - <text style="color: red;">*</text>车辆类型:
65   - </view>
66   - <!-- <scrollText :candidates="candidates" /> -->
67   - <view style="display:flex; align-items: center;" hover-class="hoverClickStyle"
68   - @click.stop="handleCarInfoClick(true)">
69   - <u--input color="#909399" border="none" style="pointer-events:none" :modelValue="paramFrom.carType"
70   - type="text" placeholder-class="line" readonly />
71   - </view>
72   - </view>
73 59 <view class="company-clean-container-car-main-content">
74   - <view v-if="paramFrom.carType" class="company-clean-container-car-main-content-type">
  60 + <!-- <view v-if="paramFrom.carType" class="company-clean-container-car-main-content-type">
75 61 <view class="company-clean-container-car-main-content-type-price-area">
76 62 <text style="color: red;">*</text>车辆数量:
77 63 </view>
... ... @@ -79,6 +65,30 @@
79 65 <u-number-box :min="0" :max="9999" integer buttonSize="46" :inputWidth="100"
80 66 v-model="garCarInfoList[paramFrom.carType].garOrderCarNumber"></u-number-box>
81 67 </view>
  68 + </view> -->
  69 + <view class="company-clean-container-car-popup">
  70 + <!-- 主要内容 -->
  71 + <view class="company-clean-container-car-popup-content">
  72 + <view class="company-clean-container-car-popup-content-title">
  73 + <view style="text-align: left;">
  74 + <text style="color: red;">*</text>车辆选择:
  75 + </view>
  76 + </view>
  77 + <view class="company-clean-container-car-popup-content-box">
  78 + <view class="company-clean-container-car-popup-content-box-item"
  79 + v-for="(item, index) in garCarInfoList" :key="index">
  80 + <view class="company-clean-container-car-popup-content-box-item-text">
  81 + {{ item.garOrderCarType }}
  82 + </view>
  83 + <view class="company-clean-container-car-popup-content-box-item-number"
  84 + hover-class="hoverClickStyle">
  85 + <u-number-box :min="0" :max="9999" integer buttonSize="46" :inputWidth="100"
  86 + v-model="garCarInfoList[item.garOrderCarType].garOrderCarNumber"
  87 + :disabledInput="true"></u-number-box>
  88 + </view>
  89 + </view>
  90 + </view>
  91 + </view>
82 92 </view>
83 93 </view>
84 94  
... ... @@ -91,6 +101,43 @@
91 101 type="text" placeholder-class="line" readonly />
92 102 </view>
93 103 </view>
  104 + <view class="company-clean-container-car-main-content-type">
  105 + <view class="company-clean-container-car-main-content-type-price-area">
  106 + <text style="color: red;">*</text>是否进入车库:
  107 + </view>
  108 + <view style="width:100%;display: flex;justify-content: center;align-items: center; ">
  109 + <view style="display: flex;">
  110 + <up-radio-group shape="square" size="30" v-model="paramFrom.garInCarStore" placement="row"
  111 + @change="handleInCarClick">
  112 + <up-radio activeColor="#19a97c" labelSize="30"
  113 + :customStyle="{ marginBottom: '8px', marginRight: '30rpx' }" label="是" :name="true">
  114 + </up-radio>
  115 + <up-radio activeColor="#19a97c" labelSize="30"
  116 + :customStyle="{ marginBottom: '8px', marginRight: '30rp' }" label="否" :name="false">
  117 + </up-radio>
  118 + </up-radio-group>
  119 + </view>
  120 + </view>
  121 + </view>
  122 + <view v-if="paramFrom.garInCarStore" class="company-in-car-store-box-info">
  123 + <view class="company-clean-container-site-image-info-input-remark-box">
  124 + <u--textarea v-model="paramFrom.remark" placeholder="请输入备注 示例：限高2、3米，需要进入车库..."></u--textarea>
  125 + </view>
  126 + <view class="company-clean-container-car-main-content-remark" style="margin-top: 20rpx; font-size: 23rpx;">
  127 + 提示：需要进入车库需要写车辆限高，部门车库限高2.3m，如果装修垃圾在车库，要考虑车辆是否能进入。
  128 + </view>
  129 + </view>
  130 + <view v-if="paramFrom.carType" class="company-clean-container-car-main-content-type">
  131 + <view class="company-clean-container-car-main-content-type-price-area">
  132 + <text style="color: red;">*</text>车辆信息:
  133 + </view>
  134 + <!-- <scrollText :candidates="candidates" /> -->
  135 + <view style="display:flex; align-items: center;" hover-class="hoverClickStyle"
  136 + @click.stop="handleCarInfoClick(true)">
  137 + <u--input color="#909399" border="none" style="pointer-events:none" :modelValue="paramFrom.carType"
  138 + type="text" placeholder-class="line" readonly />
  139 + </view>
  140 + </view>
94 141 <view class="company-clean-container-car-main-content-img">
95 142 <image class="company-clean-container-car-main-content-img" :src="carFront" />
96 143 </view>
... ... @@ -110,34 +157,13 @@
110 157 <u-upload width="200" height="150" :fileList="fileList" @afterRead="afterRead" :deletable="deletable"
111 158 @delete="deletePic" name="10" multiple :maxCount="10" :previewFullImage="true"></u-upload>
112 159 </view>
113   - <view class="company-in-car-store-box">
114   - <view class="company-in-car-store-box-content"
115   - style="font-size: 15rpx;display: flex;color: white; justify-content: flex-end;">
116   - <view
117   - :class="paramFrom.garInCarStore ? 'company-in-car-store-box-text-yes' : 'company-in-car-store-box-text-no'"
118   - @click="handleInCarClick" style="padding: 10rpx;box-sizing: border-box;border-radius: 15rpx;">
119   - 需要进入车库?
120   - </view>
121   - </view>
122   - </view>
123   - <view v-if="paramFrom.garInCarStore" class="company-in-car-store-box-info">
124   - <view class="company-clean-container-site-image-info-input-remark">
125   - 填写备注
126   - </view>
127   - <view class="company-clean-container-site-image-info-input-remark-box">
128   - <u--textarea v-model="paramFrom.remark" placeholder="请输入内容"></u--textarea>
129   - </view>
130   - <view class="company-in-car-store-box-prompt" style="margin-top: 20rpx; font-size: 23rpx;">
131   - 提示：需要进入车库需要写车辆限高，部门车库限高2.3m，如果装修垃圾在车库，要考虑车辆是否能进入。
132   - </view>
133   - </view>
134 160 </view>
135 161 <view class="company-clean-container-site-image-info-sure-button">
136 162 <view class="company-clean-container-site-image-info-sure-button-radio">
137 163 <view @click="changeAgree">
138 164 <u-checkbox-group v-model="paramFrom.sureReadFlag" placement="row">
139   - <u-checkbox activeColor="#19a97c" :customStyle="{ marginBottom: '0px', marginTop: '1px' }" size="25"
140   - labelSize="25" shape="square" :key="0" :name="true" :labelDisabled="true"
  165 + <u-checkbox activeColor="#19a97c" :customStyle="{ marginBottom: '0px', marginTop: '1px' }" size="28"
  166 + labelSize="28" shape="square" :key="0" :name="true" :labelDisabled="true"
141 167 labelColor="#909399"></u-checkbox>
142 168 </u-checkbox-group>
143 169 </view>
... ... @@ -158,7 +184,7 @@
158 184 <view class="company-clean-bottom-box">
159 185 <view class="company-clean-bottom-left">
160 186 <view class="company-clean-bottom-left-icon">
161   - <u-icon @click="carPopupShowFlag = true" :stop="true" size="50" name="car-fill"></u-icon>
  187 + <u-icon :stop="true" size="50" name="car-fill"></u-icon>
162 188 </view>
163 189 <view class="company-clean-bottom-left-number">
164 190 <up-badge :type="type" max="99" :value="garCarNumberCount"></up-badge>
... ... @@ -223,7 +249,7 @@ const garCarTransportInfo = computed(() =&gt; {
223 249 let bagVolume = bagLength * bagWidth * bagHeight; // 袋子的体积（单位：立方米）
224 250  
225 251 let bagCount = Math.floor(boxVolume / bagVolume); // 箱子可以容纳的袋子数量（向下取整）
226   -
  252 + console.log(bagCount, boxVolume, bagVolume);
227 253 return `箱体长${boxLength}m宽${boxWidth}m高${boxHeight}m，最多课容纳约${bagCount}袋袋装修垃圾（75cm * 45cm每袋）。`
228 254 } catch (error) {
229 255 return "符合装修垃圾运输管理规范的新型环保智能装修垃圾运输车。"
... ... @@ -337,8 +363,10 @@ const initOptions = async (options) =&gt; {
337 363 })
338 364 }
339 365  
340   -const handleInCarClick = () => {
341   - paramFrom.value.garInCarStore = !paramFrom.value.garInCarStore
  366 +const handleInCarClick = (val) => {
  367 + // console.log(val);
  368 + // console.log(paramFrom.value.garInCarStore);
  369 + // paramFrom.value.garInCarStore = !paramFrom.value.garInCarStore
342 370 }
343 371  
344 372 const handleCarInfoClick = (val) => {
... ... @@ -779,7 +807,7 @@ $custom-bottom-height: 200rpx;
779 807 box-sizing: border-box;
780 808 display: flex;
781 809 // flex-flow: row wrap;
782   - font-size: 25rpx;
  810 + font-size: 28rpx;
783 811 color: $u-info;
784 812 }
785 813 }
... ... @@ -855,18 +883,17 @@ $custom-bottom-height: 200rpx;
855 883  
856 884 // 弹出框
857 885 .company-clean-container-car-popup {
858   - min-height: 450rpx;
859   - padding: $custom-page-padding;
860 886 box-sizing: border-box;
  887 + color: $u-info;
861 888  
862 889 .company-clean-container-car-popup-content {
863 890 font-size: 28rpx;
864 891  
865 892 .company-clean-container-car-popup-content-box {
866 893 box-sizing: border-box;
867   - padding: $custom-page-padding;
868   - border: 2rpx solid #19a97c;
  894 + padding: 0 $custom-page-padding;
869 895 border-radius: 10rpx;
  896 + border: 1rpx solid $u-info;
870 897  
871 898 .company-clean-container-car-popup-content-box-item {
872 899 display: flex;
... ... @@ -882,11 +909,10 @@ $custom-bottom-height: 200rpx;
882 909 }
883 910  
884 911 .company-clean-container-car-popup-content-title {
885   - color: $u-main-color;
  912 + color: $u-info;
886 913 box-sizing: border-box;
887   - margin-bottom: 20rpx;
888   - font-size: 30rpx;
889   - font-weight: bold;
  914 + font-size: 28rpx;
  915 + line-height: 30rpx;
890 916 }
891 917 }
892 918  
... ...
garbage-removal/src/pages/login/index.vue
  View file @08664d9
... ... @@ -24,7 +24,7 @@
24 24 <view style="display: flex; justify-content: flex-start;" @click="radioChange">
25 25 <u-checkbox-group v-model="agree" placement="row" @change="groupChange">
26 26 <!-- 选中颜色为绿色 -->
27   - <u-checkbox shape="square" activeColor="#19a97c" :size="24"
  27 + <u-checkbox shape="square" activeColor="#19a97c" :size="28"
28 28 :customStyle="{ marginBottom: '0px', marginTop: '1px' }" :key="0" :name="true">
29 29 </u-checkbox>
30 30 </u-checkbox-group>
... ... @@ -193,7 +193,7 @@ export default {
193 193  
194 194 .hint {
195 195 padding: 20rpx 40rpx;
196   - font-size: 25rpx;
  196 + font-size: 28rpx;
197 197 color: $u-tips-color;
198 198 display: flex;
199 199 justify-content: flex-start;
... ...