Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/pages/index/index.vue

@@ -266,6 +266,7 @@ function jumpProductDetails(item) {
 // 搜索
 const toSearch = (keyword) => {
   listParams.keyword = keyword;
+  reset();
   getMerchantList();
 };
 // 获取优惠券
@@ -564,6 +565,7 @@ page {
         display: flex;
         justify-content: space-evenly;
         margin-top: 32rpx;
+        align-items: center;
         .choice {
           display: flex;
           flex-direction: column;
@@ -583,6 +585,7 @@ page {
         display: flex;
         justify-content: space-evenly;
         margin-top: 34rpx;
+        align-items: center;
         .choice {
           display: flex;
           flex-direction: column;

src/pages/order/remark.vue

@@ -9,13 +9,8 @@
             <view class="item01" prop="merchantServices">
               <text class="label">评分</text>
               <!-- 评分 -->
-              <wd-rate
-                v-model="formdata.merchantServices"
-                active-color="#ff0000"
-                size="50rpx"
-                space="10px"
-                @change="handlemerchant"
-              />
+              <wd-rate v-model="formdata.merchantServices" active-color="#ff0000" size="50rpx" space="10px"
+                @change="handlemerchant" />
             </view>
             <view class="item02">
               <text>{{ merList[formdata.merchantServices] }}</text>
@@ -23,34 +18,20 @@
           </view>
           <!-- 内容描述 -->
           <view prop="evaluation">
-            <wd-textarea
-              v-model="formdata.evaluation"
-              placeholder="亲，分享您的看法，给其他人一个参考哦！"
-            />
+            <wd-textarea v-model="formdata.evaluation" placeholder="亲，分享您的看法，给其他人一个参考哦！" />
           </view>
           <wd-cell title-width="0px"></wd-cell>
           <text class="textarea">上传图片/视频</text>
           <!-- 图片上传 -->
           <view class="wdUpload" prop="images">
-            <wd-upload
-              multiple
-              :action="action"
-              @change="handleFile"
-              :file-list="formdata.images"
-              :before-remove="beforeRemove"
-              :header="headers"
-            ></wd-upload>
+            <wd-upload multiple :action="action" @change="handleFile" :file-list="formdata.images"
+              :before-remove="beforeRemove" :header="headers"></wd-upload>
           </view>
 
           <!-- 匿名评价 -->
           <wd-cell title="匿名评价" prop="isAnonymous" class="itemSwichval">
-            <wd-switch
-              size="48rpx"
-              active-color="#EC1B1B"
-              v-model="formdata.isAnonymous"
-              active-value="1"
-              inactive-value="0"
-            />
+            <wd-switch size="48rpx" active-color="#EC1B1B" v-model="formdata.isAnonymous" active-value="1"
+              inactive-value="0" />
           </wd-cell>
         </wd-cell-group>
       </wd-form>
@@ -311,8 +292,10 @@ const handleSubmit = async () => {
       :deep(.wd-upload__status-content) {
         background-color: #000;
       }
+
       :deep(.wd-upload) {
         gap: 20rpx;
+
         .wd-upload__preview {
           width: calc((100% - 60rpx) / 4);
           margin: 0;