Merge branch 'temp' into test

pages/cloud/haveFun.vue

@@ -162,6 +162,7 @@ export default {
     
   },
   onShow() {
+    const memCityName = uni.getStorageSync('cityName')
     this.page = 1
     this.currType = {}
     this.typeIndex = 0
@@ -171,13 +172,23 @@ export default {
       this.currType = data[this.typeIndex]
       this.getMapData()
     })
-    const memCityName = uni.getStorageSync('cityName')
     if (memCityName.length) {
       this.cityName = memCityName
       uni.removeStorageSync('cityName')
       this.name = ''
     }
   },
+  watch: {
+    cityName: {
+      handler(value) {
+        if(value) {
+          this.search()
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   methods: {
     goCity() {
       uni.navigateTo({
@@ -197,7 +208,7 @@ export default {
         if(!this.cityName) {
           this.cityName = address[1].data.result.ad_info.city
         }
-        this.search()
+        // this.search()
       }
     },
     tapType(index) {
@@ -270,7 +281,7 @@ export default {
   //padding-top: 120rpx;
 
   .top-box {
-    padding: 32rpx 0 20rpx;
+    padding: 32rpx 0 0rpx;
     background: #f5f5f5;
 
     .search-box {
@@ -371,7 +382,7 @@ export default {
   padding: 0 20rpx;
   background-color: #f5f5f5;
   .title {
-    padding: 20rpx 0;
+    padding: 0 0 20rpx;
     .img {
       display: block;
       height: 48rpx;

pages/order/MyOrder/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="my-order v12-mx-2" ref="container">
+  <view class="my-order v12-mx-2" ref="container" @click="handleBody">
     <view class="m-search-wrap v12-mb-2 v12-mt-3">
       <u-search placeholder="请输入商品名/订单号" shape="round" :inputStyle="inputStyle" :showAction="false" bgColor="#FFF" v-model="keyword" @search="changeType"></u-search>
     </view>
@@ -107,7 +107,7 @@
           <view class="group-btn"
                 v-if="(Number(order._status._type) === 2 || Number(order._status._type) === 3) &&
                     order.isTickets === 0">
-            <text class="btn-more v12-font-24" @click="tapShowMore(order,orderListIndex)">更多</text>
+            <text class="btn-more v12-font-28 v12-font-bold" @click.stop="tapShowMore(order,orderListIndex)">更多</text>
             <view class="group-float" v-show="order.showMore">
               <view class="btn btn-service flex jc-center ai-center v12-font-24" @click="goRoom(order)"
                     v-if="order.merName">联系商家
@@ -309,6 +309,12 @@ export default {
     }
   },
   methods: {
+    handleBody() {
+      this.orderList.forEach((e) => {
+        e.showMore = false
+      })
+      this.$forceUpdate()
+    },
     delOrder(order) {
       delOrderHandle(order.orderId).then(() => {
         // this.goBack()

pages/order/OrderDetails/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="order-details" style="padding: 30rpx;">
+  <view class="order-details" style="padding: 30rpx;" @click="handleBody">
     <!-- 给header上与data上加on为退款订单-->
     <view class=" v12-pa-3 v12-white" :class="refundOrder ? 'on' : ''" style="border-radius: 20rpx;">
       <!-- <view class="status-img-box">
@@ -344,7 +344,7 @@
           <view class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
           <view class="v12-justify-between">
             <view class="" style="position: relative">
-              <text class="btn-more v12-font-24 v12-mr-2" @click="showMore = !showMore">更多</text>
+              <text class="btn-more v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</text>
               <view class="group-float" v-show="showMore" :style="{top: orderInfo.isExtendedDelivery==0 ? '-60px' : '-32px'}">
                 <view v-if="orderInfo.isExtendedDelivery==0" class="btn flex jc-center ai-center v12-font-24" @click="toDelay(orderInfo.orderId)">延长收货</view>
                 <view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view>
@@ -544,6 +544,10 @@ export default {
   },
   methods: {
     copyClipboard,
+    handleBody() {
+      this.showMore = false
+      this.$forceUpdate()
+    },
     getExpressInfo() {
       let params = {
         orderCode: this.orderInfo.id,

pages/user/History/index.vue

@@ -39,8 +39,8 @@
                   }"
                   class="v12-align-center  v12-mt-2"
                 >
-                  <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-22 v12-px-1">券</view>
+                  <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-18 v12-px-1">券</view>
-                  <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-22 v12-px-1">{{ historyItem.couponName }}</view>
+                  <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-18 v12-px-1">{{ historyItem.couponName }}</view>
                 </view>
                 <view class="v12-justify-between v12-mt-2 price">
                   <view class="v12-font-bold v12-primary-text v12-align-center">

pkg_common/views/room.vue

@@ -79,6 +79,8 @@
           confirm-type="send"
           @input="userInput"
           @confirm="userSend"
+          cursor-spacing="15" 
+          :adjust-position="true"
         />
       </view>
       <button @click="userSend" class="v12-primary">发送</button>

pkg_product/views/famousQianxianShop.vue

@@ -143,7 +143,7 @@
       <view>
         <!-- 资讯 -->
         <view
-          v-if="activeIndex === 0"
+          v-if="activeIndex === 3"
           class="info-section"
         >
           <view v-if="isLoadInfoListSuccess">
@@ -303,7 +303,7 @@
         </view>
         <!-- 产业 -->
         <view
-          v-if="activeIndex === 3"
+          v-if="activeIndex === 0"
           class="industry-section"
         >
           <view v-if="industryTabIndex === 0">
@@ -628,10 +628,10 @@ export default {
         height: '500rpx'
       },
       tabList: [
-        { text: '资讯', value: 0, isShow: true },
+        { text: '产业', value: 0, isShow: true },
         { text: '文化', value: 1, isShow: true },
         { text: '攻略', value: 2, isShow: true },
-        { text: '产业', value: 3, isShow: true },
+        { text: '资讯', value: 3, isShow: true },
         { text: '产品', value: 4, isShow: true }
       ],
       // 资讯
@@ -856,7 +856,7 @@ export default {
       this.loading = false
       // 刷新数据
       switch (this.activeIndex) {
-        case 0:
+        case 3:
           this.getInfoReq()
           break
         case 2: