Merge branch 'dev' of https://gitea.lihaink.cn/mkm/new_shop_app into dev

components/payment/index.vue

@@ -84,8 +84,8 @@
 				default: ''
 			},
 			sale_type: {
-				type: String,
-				default: ''
+				type: [Number,String],
+				default: 1
 			}
 		},
 		data() {

pages/cloud_warehouse/market/market.vue

@@ -628,7 +628,7 @@
 							long: longitude
 						}).then(res => {
 							let town = res.data.address_reference.town.title
-							let street_id = street_id = res.data.address_reference.town.id
+							let street_id = res.data.address_reference.town.id
 							this.street = res.data.address_reference.town.title;
 							this.$store.commit('setAddress', {
 								street_id: street_id,
@@ -637,6 +637,19 @@
 							uni.$emit('getLocation_succees', {
 								street_id,
 							});
+              uni.$emit('changeAddress', {
+                addr:{
+                  address: res.data.address,
+                  location: `${res.data.location.lat},${res.data.location.lng}`
+                },
+                area: res.data.ad_info.adcode,
+                latitude: res.data.location.lat,
+                longitude: res.data.location.lng,
+                street:{
+                  code: street_id,
+                  name: town
+                }
+              })
 							this.where.location = `${latitude},${longitude}`;
 							this.$nextTick(() => {
 								setTimeout(() => {

pages/gather/gather.vue

@@ -130,7 +130,7 @@
   }
 </style>
 <template>
-  <view class="gather">
+  <view class="gather" @click.stop="clickWhite">
     <!--顶部定位-->
     <view class="gather-header">
       <view style="height: var(--status-bar-height);"></view>
@@ -182,18 +182,18 @@
       <view class="content">
         <block v-if="nowMenuList.length > 0">
           <u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
-            <view class="examine" @click="editFlag ? removeMenu(item) : clickMenu(item)">
+            <view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"  @longpress="editFlag = true">
               <image class="icon_img" :src="item.pic" mode="aspectFit">
               </image>
               <!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
-              <view v-if="editFlag" class="icon" style="background-color: red;">隐藏</view>
+              <view v-if="editFlag" class="icon" style="background-color: red;">删除</view>
               <text class="text">{{ item.name }}</text>
             </view>
           </u-transition>
         </block>
         <view class="add-box examine"
           style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
-          @click="editFlag = true">
+          @click.stop="editFlag = true" @longpress="editFlag = true" v-if="!editFlag">
           <view class="add-box-icon"
             style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
             <u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
@@ -209,7 +209,7 @@
       </view>
       <view class="content">
         <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
-          <view class="examine" @click="pushMenu(item)">
+          <view class="examine" @click.stop="pushMenu(item)">
             <image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
             <!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
             <view class="icon">添加</view>
@@ -524,6 +524,10 @@
           }
         });
       },
+      // 点击空白区域完成添加
+      clickWhite(){
+        if(this.editFlag) this.editFlag = false;
+      }
     }
   };
 </script>

utils/uniMP.js

@@ -339,7 +339,8 @@ const open = (id = null) => {
 			uniMP: true,
 			token: token,
 			avatar: avatar,
-		}
+		},
+    // path: '/pages/index/index?unimp=true'
 	}, (ret) => {
 		uni.hideLoading();
 		if (0 != ret.code) {

utils/uniMPevent.js

@@ -3,7 +3,7 @@ import {
 	uniMPgetLocation,
 	test
 } from "@/utils/uniMPfunction.js"
-console.log(123)
+
 export const initEvent = () => {
 	mp.onUniMPEventReceive(async (ret) => {
 		console.log('小程序事件: ', ret);