Feat(AI):关键词搜索匹配相关模块列表

README.md

@@ -9,9 +9,6 @@
 
 #### 安装教程
 
-
-
-
 1.  xxxx
 2.  xxxx
 3.  xxxx

aiChat/components/bottomSend.vue

@@ -23,13 +23,12 @@
         </view>
         <!-- 输入框 -->
         <view class="input-wrap flex-center-between">
-          <textarea
+          <input
             v-model.trim="prompt"
             :show-confirm-bar="false"
             :adjust-position="true"
-            :auto-height="true"
             :disabled="loading"
-            :maxlength="500"
+            :maxlength="-1"
             class="inp"
             @confirm="sendHandle"
             @focus="promptInputFocusHandle"
@@ -112,10 +111,6 @@ export default {
     keyboardHeight: {
       type: Number,
       default: 0
-    },
-    voiceException: {
-      type: String,
-      default: '没有听清您说了什么，请再说一遍'
     }
   },
   data() {
@@ -132,7 +127,6 @@ export default {
        * 怎么申请地理标志保护产品?
        * 想找个像《去有风的地方》那样的治愈县城
        * 云南有哪些小众县城适合旅居?
-       * 查询最近一个月的订单
       */
       prompt: '',
       recordManager: null,
@@ -266,11 +260,11 @@ export default {
               fail: err => {
                 console.log(err)
                 uni.hideLoading()
-                _this.$toast(_this.voiceException)
+                _this.$toast('没有听清您说了什么，请再说一遍')
               }
             })
           } else {
-            _this.$toast(_this.voiceException)
+            _this.$toast('没有听清您说了什么，请再说一遍')
           }
         })
       }
@@ -286,7 +280,7 @@ export default {
         _this.getTransResultReq()
       }).catch(() => {
         uni.hideLoading()
-        _this.$toast(_this.voiceException)
+        _this.$toast('没有听清您说了什么，请再说一遍')
       })
     },
     getTransResultReq() {
@@ -300,7 +294,7 @@ export default {
             uni.hideLoading()
             _this.clearIntervalFn()
             if (data === '__NULL__') {
-              _this.$toast(_this.voiceException)
+              _this.$toast('没有听清您说了什么，请再说一遍')
             } else {
               if (data.length > 0) {
                 const prompt = data[0].Text
@@ -312,7 +306,7 @@ export default {
           }
         }).catch(() => {
           uni.hideLoading()
-          _this.$toast(_this.voiceException)
+          _this.$toast('没有听清您说了什么，请再说一遍')
         })
       }, 1000)
     },

aiChat/components/historyList.vue

@@ -37,7 +37,7 @@
         </view>
         <view v-else class="no-data">
           <image
-            :src="webUrl + '/aiChat/ai-chat-no-data.png'"
+            :src="webUrl + '/orderIcon/nodata1.png'"
             class="img"
             mode="widthFix"
           />
@@ -68,7 +68,7 @@
         </view>
         <view v-else class="no-data">
           <image
-            :src="webUrl + '/aiChat/ai-chat-no-data.png'"
+            :src="webUrl + '/orderIcon/nodata1.png'"
             class="img"
             mode="widthFix"
           />
@@ -99,7 +99,7 @@
         </view>
         <view v-else class="no-data">
           <image
-            :src="webUrl + '/aiChat/ai-chat-no-data.png'"
+            :src="webUrl + '/orderIcon/nodata1.png'"
             class="img"
             mode="widthFix"
           />
@@ -112,9 +112,7 @@
 <script>
 import {
   getChatList,
-  deleteChatListByType,
+  deleteChatListByType
-  getCountyAiChatList,
-  deleteCountyChatListByType
 } from '@/api/chat/index'
 export default {
   name: 'AiHistoryList',
@@ -127,10 +125,6 @@ export default {
     formModule: {
       type: String,
       default: ''
-    },
-    countyId: {
-      type: String,
-      default: ''
     }
   },
   data() {
@@ -148,17 +142,7 @@ export default {
       this.getChatListReq()
     },
     getChatListReq() {
-      let reqFn = null
+      getChatList().then(res => {
-      let params = {}
-      if (this.countyId) {
-        reqFn = getCountyAiChatList
-        params = {
-          countyId: this.countyId
-        }
-      } else {
-        reqFn = getChatList
-      }
-      reqFn(params).then(res => {
         const { success, data } = res
         if (success) {
           this.todayList = data['今天'] || []
@@ -168,15 +152,7 @@ export default {
       })
     },
     deleteRecords(type) {
-      let reqFn = null
+      deleteChatListByType(type).then(res => {
-      let params = ''
-      if (this.countyId) {
-        reqFn = deleteCountyChatListByType
-        params = `?countyId=${this.countyId}&type=${type}`
-      } else {
-        reqFn = deleteChatListByType
-      }
-      reqFn(type, params).then(res => {
         const { success } = res
         if (success) {
           this.getChatListReq()
@@ -184,7 +160,7 @@ export default {
       })
     },
     historyItemClick(item) {
-      const paramsStr = `?chatNumber=${item.chatNumber}&title=${item.title}&click=1&countyId=${this.countyId}`
+      const paramsStr = `?chatNumber=${item.chatNumber}&title=${item.title}&click=1`
       if (!this.formModule) {
         uni.navigateTo({
           url: '/aiChat/views/history' + paramsStr
@@ -194,7 +170,6 @@ export default {
           url: '/aiChat/views/history' + paramsStr
         })
       }
-      this.$emit('enterHistory')
       this.closeLayer()
     },
     closeLayer() {

aiChat/components/orderItem.vue

@@ -1,263 +0,0 @@
-<template>
-  <view
-    class="order-item"
-  >
-    <view class="order-header">
-      <view class="order-shop">
-        <view class="shop-name">
-          <image
-            :src="webUrl + '/aiChat/icon-57.png'"
-            class="icon"
-            mode="widthFix"
-            lazy-load
-          />
-          {{ item.merName }}
-        </view>
-        <view class="order-id">
-          订单号：{{ item.orderId }}
-        </view>
-      </view>
-      <view class="status">
-        {{ item.statusName }}
-      </view>
-    </view>
-    <view v-if="item.isGiftCardReceiveBlind === 0" class="product-info-wrap">
-      <view
-        v-for="cartItem in item.cartInfo"
-        :key="cartItem.productId"
-        class="product-info"
-      >
-        <view class="good-img">
-          <image
-            :src="cartItem.productInfo.image"
-            class="img"
-            mode="widthFix"
-            lazy-load
-          />
-        </view>
-        <view class="name-wrap">
-          <view class="name one-t">
-            {{ cartItem.productInfo.storeName }}
-          </view>
-          <view class="attr">
-            规格：{{ cartItem.productInfo.attrInfo.sku || '' }}
-          </view>
-        </view>
-        <view class="price-num">
-          <view>
-            ￥{{ cartItem.truePrice }}
-          </view>
-          <view class="num">
-            x{{ cartItem.cartNum }}
-          </view>
-        </view>
-      </view>
-    </view>
-    <view v-else class="product-info-wrap">
-      <view
-        class="product-info product-info2"
-      >
-        <view class="good-img">
-          <image
-            :src="webUrl + '/orderIcon/盲盒礼包.png'"
-            class="img"
-            mode="widthFix"
-            lazy-load
-          />
-        </view>
-        <view class="name-wrap">
-          <view class="name one-t">
-            盲盒礼物
-          </view>
-          <view class="attr">
-            待收货后展示商品信息
-          </view>
-        </view>
-        <view class="price-num">
-          <view style="color: #fff;">
-            ￥0.00
-          </view>
-          <view class="num">
-            x1
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="order-bottom">
-      <view class="time-total">
-        <view class="time">
-          {{ formatDateTime(item.createTime) }}
-        </view>
-        <view class="total">
-          共{{ item.totalNum }}件商品
-          <text v-if="item.isGiftCardReceiveBlind === 0" class="total-txt">
-            &nbsp;&nbsp;&nbsp;&nbsp;总金额<text class="color-red">￥{{ item.payPrice }}</text>
-          </text>
-        </view>
-      </view>
-      <view class="btns">
-        <view class="btn" @click="viewOrderTrack">查看物流</view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { formatDateTime } from '@/utils/index'
-export default {
-  name: 'AiHistoryList',
-  props: {
-    item: {
-      type: Object,
-      default: () => {}
-    }
-  },
-  data() {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL
-    }
-  },
-  methods: {
-    formatDateTime,
-    viewOrderTrack() {
-      this.$emit('viewOrderTrack', this.item)
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.order-item {
-  padding: 20rpx;
-  border-radius: 20rpx;
-  background-color: #fff;
-  box-shadow: 0rpx 6rpx 20rpx rgba(101,101,101,0.16);
-  .order-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .order-shop {
-      flex: 1;
-      width: calc(100% - 120rpx);
-      .shop-name {
-        display: flex;
-        align-items: center;
-        color: #333;
-        font-size: 28rpx;
-        line-height: 40rpx;
-        .icon {
-          display: block;
-          width: 40rpx;
-          height: 40rpx;
-          margin-right: 10rpx;
-        }
-      }
-    }
-    .order-id {
-      margin-top: 20rpx;
-      font-size: 24rpx;
-      color: #666;
-    }
-    .status {
-      width: 100rpx;
-      height: 40rpx;
-      border-radius: 10rpx;
-      color: #fff;
-      font-size: 24rpx;
-      line-height: 40rpx;
-      text-align: center;
-      background: rgba(197,39,51,1);
-    }
-  }
-  .product-info {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx 0;
-    font-size: 28rpx;
-    .good-img {
-      .img {
-        display: block;
-        width: 120rpx;
-        height: 120rpx;
-        border-radius: 8rpx;
-      }
-    }
-    .name-wrap {
-      height: 120rpx;
-      width: calc(100% - 260rpx);
-      .name {
-        line-height: 40rpx;
-      }
-      .attr {
-        display: inline-block;
-        height: 50rpx;
-        max-width: 100%;
-        padding: 0 25rpx;
-        margin: 20rpx 0 0 0;
-        border-radius: 25rpx;
-        line-height: 50rpx;
-        color: #252525;
-        background: rgba(239,239,239,0.39);
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-    }
-    .price-num {
-      width: 100rpx;
-      text-align: right;
-      line-height: 40rpx;
-      .num {
-        font-size: 20rpx;
-      }
-    }
-  }
-  .product-info2 {
-    .name-wrap {
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      .attr {
-        padding: 0;
-        font-size: 24rpx;
-        color: #999;
-        background-color: #fff;
-      }
-    }
-  }
-  .order-bottom {
-    .time-total {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      color: #999;
-      font-size: 22rpx;
-      .total-txt {
-        color: #333;
-        font-size: 28rpx;
-        font-weight: 600;
-      }
-      .color-red {
-        color: #C52733;
-      }
-    }
-    .btns {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      margin: 24rpx 0 0 0;
-      .btn {
-        height: 44rpx;
-        padding: 0 24rpx;
-        border-radius: 22rpx;
-        border: 1rpx solid #C52733;
-        color: #C52733;
-        font-size: 28rpx;
-        line-height: 44rpx;
-        text-align: center;
-      }
-    }
-  }
-}
-</style>

aiChat/mixins/chatMixins.js

@@ -2,7 +2,7 @@ import {
   getSseConfigV1,
   getCompletionsV2,
   deleteChatItemByConversationId,
-  // getAnalyzeKeywordsV1,
+  getAnalyzeKeywordsV1,
   getAnalyzeKeywordsChangeV1
 } from '@/api/chat/index'
 import { VUE_APP_API_URL } from '@/config'
@@ -10,37 +10,12 @@ import settings from '@/config/baseSetting.js'
 import { formatAiMsgContent } from '../utils/aiChat'
 import cookie from '@/utils/store/cookie'
 import { handleLoginFailure } from '@/utils'
-const plugin = requirePlugin('WechatSI')
-const removeMarkdown = require('remove-markdown')
 export const chatMixins = {
   data() {
     return {
       token: cookie.get('login_status'),
       userInfo: cookie.get('userInfo'),
       webUrl: this.$VUE_APP_RESOURCES_URL,
-      bottomTools: Object.freeze([
-        {
-          icon: 'icon-50',
-          text: '我要送礼',
-          type: 'prompt',
-          prompt: '我要送礼，请给我推荐一些平台的礼品',
-          url: ''
-        },
-        {
-          icon: 'icon-51',
-          text: '订单查询',
-          type: 'prompt',
-          prompt: '订单查询',
-          url: ''
-        },
-        {
-          icon: 'icon-52',
-          text: '拍照识图',
-          type: 'link',
-          prompt: '',
-          url: '/aiChat/views/imageRecognition'
-        }
-      ]),
       scrollData: {},
       scrollTop: 0,
       isScrollToBottom: false,
@@ -71,11 +46,7 @@ export const chatMixins = {
         }
         */
       ],
-      errorMsg: Object.freeze('您提的问题未能理解，云灵思想跑偏啦，重新整理一下问题或者重新提问，让云灵再试试！'),
+      errorMsg: Object.freeze('您提的问题未能理解，云灵思想跑偏啦，重新整理一下问题或者重新提问，让云灵再试试！')
-      audioAyy: [],
-      isPlayAudio: false,
-      audioContext: null,
-      audioPlayId: ''
     }
   },
   computed: {
@@ -100,8 +71,9 @@ export const chatMixins = {
     }.bind(this)).exec()
   },
   onUnload() {
-    this.audioStopHandle()
     this.closeWsFn()
+		// console.log('在页面卸载时取消监听')
+    // wx.offKeyboardHeightChange()
   },
   created() {
     const _this = this
@@ -172,7 +144,6 @@ export const chatMixins = {
     },
     // 重新生成
     regenerateHandle(item) {
-      this.audioStopHandle()
       deleteChatItemByConversationId(item.conversationId).then(res => {
         const { success } = res
         if (success) {
@@ -250,7 +221,6 @@ export const chatMixins = {
               _this.chatErrorSetContent()
             })
           })
-          /*
           getAnalyzeKeywordsV1({
             'chatNumber': _this.chatNumber,
             conversationId,
@@ -277,7 +247,6 @@ export const chatMixins = {
               console.log(_this.chatMessageList[_this.chatMessageListLength - 1])
             }
           })
-          */
         } else {
           _this.chatErrorSetContent()
         }
@@ -309,7 +278,6 @@ export const chatMixins = {
       })
     },
     productItemClickHandle(item) {
-      this.audioStopHandle()
       this.$yrouter.push({
         path: '/pages/shop/GoodsCon/index',
         query: {
@@ -318,7 +286,6 @@ export const chatMixins = {
       })
     },
     hotelItemClickHandle(item) {
-      this.audioStopHandle()
       this.$yrouter.push({
         path: '/pagesInn/inn/innHome',
         query: {
@@ -327,7 +294,6 @@ export const chatMixins = {
       })
     },
     ichItemClickHandle(item) {
-      this.audioStopHandle()
       this.$yrouter.push({
         path: '/pkg_product/views/heritage/details',
         query: {
@@ -336,7 +302,6 @@ export const chatMixins = {
       })
     },
     qianxianItemClickHandle(item) {
-      this.audioStopHandle()
       this.$yrouter.push({
         path: '/pkg_product/views/famousQianxianShop',
         query: {
@@ -344,10 +309,6 @@ export const chatMixins = {
         }
       })
     },
-    prizeItemClickHandle() {
-      this.audioStopHandle()
-      this.$yrouter.push({ path: '/pkg-video/views/lottery' })
-    },
     chatErrorSetContent() {
       this.chatMessageList[this.chatMessageListLength - 1].isError = true
       this.chatMessageList[this.chatMessageListLength - 1].content = this.errorMsg
@@ -438,131 +399,6 @@ export const chatMixins = {
       } catch (err) {
         console.log('send failed (' + err.code + ')')
       }
-    },
-    audioStopHandle() {
-      // Fix bug#4049
-      this.audioAyy = []
-      if (this.audioContext) {
-        this.audioContext.stop()
-        this.audioContext.destroy() // 强制销毁释放资源
-        this.audioContext = null
-      }
-      this.isPlayAudio = false
-      
-      // 强制关闭微信小程序背景音频
-      if (typeof wx !== 'undefined' && wx.getBackgroundAudioManager) {
-        wx.getBackgroundAudioManager().stop()
-      }
-    },
-    ttsHandle(item) {
-      this.audioAyy = []
-      if (this.audioContext) {
-        this.audioContext.stop()
-        // this.audioContext.destroy()
-      }
-      // 如果正在播放，点击当前播放的则认为是暂停
-      if (this.isPlayAudio && item.conversationId === this.audioPlayId) {
-        this.isPlayAudio = false
-        this.audioPlayId = ''
-        return
-      }
-      this.isPlayAudio = false
-      this.audioPlayId = item.conversationId
-      const flag = 1
-      if (flag === 1) {
-        console.log(removeMarkdown(item.content).replace(/[\n\t\s]/g, ''))
-        uni.showLoading({
-          title: '合成中...'
-        })
-        this.splitAndSynthesize(removeMarkdown(item.content).replace(/[\n\t\s]/g, ''))
-      } else {
-        // 调试数据
-        this.audioAyy = [
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749075_2f71887cc48d9b3753c39d119862d4bb&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749077_0970508786c5e3edc3a68a5eb9de048c&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749079_e77cec52cc077ba981892887c3df4cdf&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749080_02db4235771f5561cdb73c06d8c67e53&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749082_534e455c5d6ac5e9a4192ecf9952851a&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749083_78c4a2fecad538561f81c48dc4ecd645&filekey=871027724&source=miniapp_plugin'
-        ]
-        this.playNextChunk()
-      }
-    },
-    splitAndSynthesize(text) {
-      const _this = this
-      if (text) {
-        const textLength = text.length
-        const chunkSize = 100
-        const chunk = text.slice(0, textLength > chunkSize ? chunkSize : textLength)
-        plugin.textToSpeech({
-          // 语言
-          lang: 'zh_CN',
-          tts: true,
-          // 要转换的文字
-          content: chunk,
-          success: function(res) {
-            console.log("语音文件路径：", res.filename)
-            _this.audioAyy.push(res.filename)
-            // 首次就立即播放，增强体验
-            if (!_this.isPlayAudio) {
-              _this.playNextChunk()
-            }
-            if (textLength > chunkSize) {
-              // 递归调用，播放一定要按照文本分割顺序
-              _this.splitAndSynthesize(text.substr(chunkSize, textLength))
-            } else {
-              // 最后一条合成，没有正在播放则立即播放
-              if (!_this.isPlayAudio) {
-                _this.playNextChunk()
-              }
-            }
-            uni.hideLoading()
-          },
-          fail: function(err) {
-            console.log("转换失败：", err)
-            uni.hideLoading()
-          }
-        })
-      } else {
-        if (!_this.isPlayAudio) {
-          _this.playNextChunk()
-        }
-        uni.hideLoading()
-      }
-    },
-    playNextChunk() {
-      if (this.audioAyy.length > 0 && this.audioPlayId) {
-        const src = this.audioAyy.shift()
-        this.isPlayAudio = true
-        const audioContext = uni.createInnerAudioContext({
-          // 是否使用 WebAudio 作为底层音频驱动，默认关闭。对于短音频、播放频繁的音频建议开启此选项，开启后将获得更优的性能表现。由于开启此选项后也会带来一定的内存增长，因此对于长音频建议关闭此选项
-          useWebAudioImplement: false
-        })
-        this.audioContext = audioContext
-        audioContext.src = src
-        audioContext.onEnded(() => {
-          audioContext.destroy()
-          this.playNextChunk()
-        })
-        audioContext.play()
-        console.log('------------src：' + src)
-      } else {
-        console.log('------------end')
-        this.isPlayAudio = false
-      }
-    },
-    bottomToolClickHandle(item) {
-      if (item.type === 'prompt') {
-        this.streamReq({
-          prompt: item.prompt,
-          init: 0
-        })
-      }
-      if (item.type === 'link') {
-        uni.navigateTo({
-          url: item.url
-        })
-      }
     }
   }
 }

aiChat/mixins/chatMixinsV2.js

@@ -1,954 +0,0 @@
-import {
-  getSseConfigV1,
-  getCompletionsV3,
-  deleteChatItemByConversationId,
-  // getAnalyzeKeywordsV1,
-  getAnalyzeKeywordsChangeV3,
-  getSseCountyAiConfigV1,
-  getCountyAiCompletionsV1,
-  getGiftRecommendOptions,
-  getGiftRecommendPrompt
-} from '@/api/chat/index'
-import {
-  getExceptionConfig,
-  getBottomNavigationConfigList
-} from '@/api/public'
-import {
-  getProductDetail,
-  postCartAdd
-} from '@/api/store'
-import { VUE_APP_API_URL } from '@/config'
-import settings from '@/config/baseSetting.js'
-import { formatAiMsgContent } from '../utils/aiChat'
-import cookie from '@/utils/store/cookie'
-import { handleLoginFailure } from '@/utils'
-const plugin = requirePlugin('WechatSI')
-const removeMarkdown = require('remove-markdown')
-export const chatMixinsV2 = {
-  data() {
-    return {
-      token: cookie.get('login_status'),
-      userInfo: cookie.get('userInfo'),
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      bottomTools: [],
-      scrollData: {},
-      scrollTop: 0,
-      isScrollToBottom: false,
-      // 状态栏高度
-      statusBarHeight: 20,
-			bottomSafeDistance: 0,
-      fileHttpStr: Object.freeze(VUE_APP_API_URL + settings.sysPrefix),
-			keyboardHeight: 0,
-      optionsFrom: '',
-      onFocus: false,
-      loading: false,
-      chatNumber: '',
-      infoResData: {},
-      chatMessageList: [],
-      audioAyy: [],
-      isPlayAudio: false,
-      audioContext: null,
-      audioPlayId: '',
-      showGiftBtn: false,
-      buyLoading: false,
-      exceptionConfig: {
-        model_exception: '您提的问题未能理解，云灵思想跑偏啦，重新整理一下问题或者重新提问，让云灵再试试！',
-        voice_exception: ''
-      },
-      giftStepLoading: false,
-      onlyOneToAddCart: false
-    }
-  },
-  computed: {
-    chatMessageListLength() {
-      return this.chatMessageList.length
-    }
-  },
-  onPageScroll(e) {
-    this.scrollData = e
-    const scrollTop = e.scrollTop
-    this.scrollTop = scrollTop
-    const query = wx.createSelectorQuery().in(this)
-    query.select('#fixTbabarBody').boundingClientRect(function(rect) {
-      const contentHeight = rect.height
-      const windowInfo = wx.getWindowInfo()
-      const windowHeight = windowInfo.windowHeight
-      if (scrollTop + windowHeight + 30 >= contentHeight) {
-        this.isScrollToBottom = true
-      } else {
-        this.isScrollToBottom = false
-      }
-    }.bind(this)).exec()
-  },
-  onUnload() {
-    this.audioStopHandle()
-    this.closeWsFn()
-  },
-  onHide() {
-    this.audioStopHandle()
-  },
-  created() {
-    const _this = this
-    uni.getSystemInfo({
-      success: (e) => {
-        let statusBar = 0
-        // #ifdef MP-WEIXIN
-        statusBar = e.statusBarHeight
-        const custom = uni.getMenuButtonBoundingClientRect()
-        _this.rightDistance = e.windowWidth - custom.left + 10
-        // #endif
-        // 状态栏高度
-        _this.statusBarHeight = statusBar
-				_this.bottomSafeDistance = e.safeAreaInsets.bottom
-      }
-    })
-    _this.createdCallbak()
-  },
-  methods: {
-    createdCallbak() {
-      this.$nextTick(() => {
-        this.scrollToBottomHandle()
-        getExceptionConfig().then(res => {
-          const { success, data } = res
-          if (success) {
-            this.exceptionConfig = data || {}
-          }
-        })
-        // 县域AI没有底部快捷操作和送礼配置
-        if (!this.countyId) {
-          getBottomNavigationConfigList().then(res => {
-            const { success, data } = res
-            if (success) {
-              this.bottomTools = data || []
-              this.bottomTools.forEach(item => {
-                item.display = true
-              })
-            }
-          })
-          getGiftRecommendOptions().then(res => {
-            const { success, data } = res
-            if (success) {
-              this.giftBuyOptions = data || {}
-            }
-          })
-        }
-        this.extraReqFn()
-      })
-    },
-    extraReqFn() {
-      console.log('首页/历史详情页面单独请求接口逻辑')
-    },
-    inputFocusHandle(value) {
-      this.onFocus = value === 1
-      this.scrollToBottomHandle()
-    },
-    historyViewHandle() {
-      console.log(this.$refs.historyView)
-      this.$refs.historyView.showView()
-    },
-    copyContentHandle(data) {
-      uni.setClipboardData({
-        data,
-        success: () => {
-          uni.showToast({
-            title: '已复制'
-          })
-        }
-      })
-    },
-    copyMoreInfoHandle(item) {
-      uni.setClipboardData({
-        data: JSON.stringify(item.showMoreInfo),
-        success: () => {
-          uni.showToast({
-            title: '已复制'
-          })
-        }
-      })
-    },
-    shareHandle() {
-      wx.showShareMenu({
-        withShareTicket: true,
-        menus: ['shareAppMessage', 'shareTimeline'],
-        success: (res) => {
-          console.log(res)
-        },
-        fail: err => {
-          console.log(err)
-        }
-      })
-    },
-    scrollToBottomHandle() {
-      uni.pageScrollTo({
-        duration: 100,
-        selector: '#bottom_postion'
-      })
-      this.isScrollToBottom = true
-    },
-    // 重新生成
-    regenerateHandle(item) {
-      this.audioStopHandle()
-      deleteChatItemByConversationId(item.conversationId).then(res => {
-        const { success } = res
-        if (success) {
-          this.chatMessageList.splice(this.chatMessageListLength - 1, 1)
-          this.streamReq({
-            prompt: item.prompt,
-            init: 1
-          })
-        }
-      })
-    },
-    // 建议提问
-    suggestionItemClickHandle(question) {
-      this.streamReq({
-        prompt: question,
-        init: 0
-      })
-    },
-    // 大家都在问
-    topicItemClickHandle(question) {
-      this.streamReq({
-        prompt: question,
-        init: 0
-      })
-    },
-    streamReq(params) {
-      const _this = this
-      // 需要校验登录状态
-      if (!_this.token) {
-        handleLoginFailure()
-        return
-      }
-      if (params.prompt.length > 500) {
-        uni.showToast({
-          title: "字数已超出限制",
-          icon: "none",
-          duration: 5000
-        })
-        return
-      }
-      if (this.loading) return
-      const prompt = params.prompt.substr(0, 500)
-      if (params.init !== 1) {
-        _this.chatMessageList.push({
-          prompt,
-          type: -1
-        })
-      }
-      _this.$nextTick(() => {
-        _this.scrollToBottomHandle()
-      })
-      _this.chatMessageList.push({
-        content: '',
-        nodes: '',
-        isError: false,
-        showCursor: false,
-        conversationId: '',
-        prompt,
-        listQuestion: [],
-        // 特产商品
-        goodsList: [],
-        // 礼品商品
-        giftGoodsList: [],
-        // 非遗文化
-        ichList: [],
-        // 千县名品
-        qianxianList: [],
-        // 抽奖
-        prizeList: [],
-        // 店铺
-        shopList: [],
-        // 地标好物--屏蔽原因：实现此功能时，后端通过AI动态返回的图片不满足需求，后面就不要了
-        landmarksList: [],
-        // 订单
-        orderList: [],
-        type: -2,
-        showMoreInfo: {},
-        currentSwiperIndex: 0,
-        showChangeBtn: true,
-        changeIsRotate: false
-      })
-      _this.loading = true
-      _this.showCursor = false
-      let reqFn = null
-      let postData = {}
-      if (_this.countyId) {
-        reqFn = getSseCountyAiConfigV1
-        postData = {
-          'countyId': _this.countyId,
-          'chatNumber': _this.chatNumber,
-          prompt
-        }
-      } else {
-        reqFn = getSseConfigV1
-        postData = {
-          'chatNumber': _this.chatNumber,
-          prompt
-        }
-      }
-      reqFn(postData).then(resConfig => {
-        const conversationId = resConfig.data.conversationId
-        _this.chatNumber = resConfig.data.chatNumber || ''
-        _this.chatMessageList[_this.chatMessageListLength - 1].showCursor = true
-        _this.chatMessageList[_this.chatMessageListLength - 1].conversationId = conversationId
-        if (conversationId) {
-          _this.initWebSocket(conversationId, () => {
-            
-            let completionsReqFn = null
-            let completionsPostData = {}
-            if (_this.countyId) {
-              completionsReqFn = getCountyAiCompletionsV1
-              completionsPostData = {
-                conversationId,
-                countyId: _this.countyId,
-                ws: true,
-                isNoNeedPublicErrorNotification: 1
-              }
-            } else {
-              completionsReqFn = getCompletionsV3
-              completionsPostData = {
-                conversationId,
-                ws: true,
-                isNoNeedPublicErrorNotification: 1
-              }
-            }
-            completionsReqFn(completionsPostData).then(sseRes => {
-              console.log(sseRes)
-              // _this.closeWsFn()
-            }).catch(err => {
-              console.log(err)
-              _this.chatErrorSetContent()
-            })
-          })
-        } else {
-          _this.chatErrorSetContent()
-        }
-      }).catch(err => {
-        console.log(err)
-        _this.chatErrorSetContent()
-      })
-    },
-    initWebSocket(conversationId, cb) {
-      const _this = this
-      console.log('------------------创建连接')
-      uni.connectSocket({
-        url: VUE_APP_API_URL.replace('https', 'wss') + settings.sysPrefix + `v1/chat/websocket/${_this.userInfo.unionId}-${conversationId}`,
-        header: {
-          'content-type': 'application/json'
-        },
-        timeout: 10 * 1000,
-        success: () => {
-          console.log('------------WebSocket初始化成功')
-        },
-        fail: (err) => {
-          uni.showModal({
-            showCancel: false,
-            content: err
-          })
-        }
-      })
-      uni.onSocketMessage(res => {
-        _this.websocketOnmessage(res)
-      })
-      uni.onSocketOpen(() => {
-        cb && cb()
-        _this.websocketOnopen()
-      })
-      uni.onSocketError(err => {
-        _this.websocketOnerror(err)
-      })
-    },
-    websocketOnmessage(res) {
-      console.log('-------------监听 WebSocket 接受到服务器的消息事件')
-      const resData = JSON.parse(res.data)
-      if (resData) {
-        const message = resData.message
-        console.log(message)
-        if (message && this.chatMessageListLength > 1) {
-          const mesContent = message.content
-          const contentType = message.contentType
-          const finish = message.finish
-          if (contentType === 'text') {
-            if (!finish && mesContent) {
-              this.chatMessageList[this.chatMessageListLength - 1].nodes = formatAiMsgContent(mesContent)
-              this.chatMessageList[this.chatMessageListLength - 1].content = mesContent
-              this.chatMessageList[this.chatMessageListLength - 1].listQuestion = message.listQuestion || []
-            }
-          }
-          if (contentType === 'order') {
-            if (!finish && message.listCards) {
-              this.chatMessageList[this.chatMessageListLength - 1].orderList = message.listCards || []
-            }
-          }
-          if (contentType === 'shop') {
-            if (!finish && message.listCards) {
-              this.chatMessageList[this.chatMessageListLength - 1].shopList = message.listCards || []
-            }
-          }
-          if (contentType === 'gift') {
-            if (!finish && message.listCards) {
-              this.chatMessageList[this.chatMessageListLength - 1].giftGoodsList = message.listCards || []
-            }
-          }
-          if (contentType === 'discount') {
-            if (!finish && message.listCards) {
-              this.chatMessageList[this.chatMessageListLength - 1].prizeList = message.listCards || []
-            }
-          }
-          if (contentType === 'goods') {
-            if (!finish && message.listCards) {
-              this.chatMessageList[this.chatMessageListLength - 1].goodsList = message.listCards || []
-            }
-          }
-          if (contentType === 'famous') {
-            if (!finish && message.listCards) {
-              this.chatMessageList[this.chatMessageListLength - 1].qianxianList = message.listCards || []
-            }
-          }
-          if (contentType === 'ich') {
-            if (!finish && message.listCards) {
-              this.chatMessageList[this.chatMessageListLength - 1].ichList = message.listCards || []
-            }
-          }
-          if (contentType === 'landmarks') {
-            if (!finish && message.listCards) {
-              this.chatMessageList[this.chatMessageListLength - 1].landmarksList = message.listCards || []
-            }
-          }
-          this.$forceUpdate()
-          this.$nextTick(() => {
-            this.scrollToBottomHandle()
-            if (finish) {
-              this.closeWsFn()
-            }
-          })
-        }
-      }
-    },
-    websocketOnopen() {
-      console.log('------------------监听 WebSocket 连接打开事件')
-      // this.websocketSend(JSON.stringify({ msg: '1' }))
-    },
-    websocketOnerror(e) {
-      console.log('-----------------监听 WebSocket 错误事件')
-      console.log(e)
-    },
-    websocketSend(msg) {
-      // 数据发送
-      try {
-        uni.sendSocketMessage({
-          data: msg,
-          success: () => {
-            console.log('-----------发送消息成功了')
-          }
-        })
-      } catch (err) {
-        console.log('send failed (' + err.code + ')')
-      }
-    },
-    onSwiperChange(index, e) {
-      this.chatMessageList[index].currentSwiperIndex = e.detail.current
-    },
-    analyzeKeywordsChangeHandle(conversationId, item) {
-      let idx = -1
-      this.chatMessageList.map((item, index) => {
-        if (item.conversationId === conversationId) {
-          idx = index
-        }
-      })
-      if (idx > -1) {
-        if (this.chatMessageList[idx].changeIsRotate) {
-          return
-        }
-        this.$set(this.chatMessageList[idx], 'changeIsRotate', true)
-      }
-      let listKey = ''
-      // 抽奖和订单查询没有换一换
-      if (item.goodsList.length > 0) {
-        listKey = 'goodsList'
-      }
-      if (item.giftGoodsList.length > 0) {
-        listKey = 'giftGoodsList'
-      }
-      if (item.ichList.length > 0) {
-        listKey = 'ichList'
-      }
-      if (item.qianxianList.length > 0) {
-        listKey = 'qianxianList'
-      }
-      if (item.shopList.length > 0) {
-        listKey = 'shopList'
-      }
-      getAnalyzeKeywordsChangeV3({
-        conversationId
-      }).then(res => {
-        const { success, data } = res
-        if (success) {
-          let changeList = []
-          this.chatMessageList.map((item) => {
-            if (item.conversationId === conversationId) {
-              changeList = data.list || []
-            }
-          })
-          if (idx > -1 && listKey) {
-            this.$set(this.chatMessageList[idx], listKey, changeList)
-            this.$forceUpdate()
-          }
-          setTimeout(() => {
-            this.$set(this.chatMessageList[idx], 'changeIsRotate', false)
-          }, 1000)
-        }
-      }).catch(error => {
-        this.$set(this.chatMessageList[idx], 'changeIsRotate', false)
-      })
-    },
-    productItemClickHandle(item) {
-      this.audioStopHandle()
-      this.$yrouter.push({
-        path: '/pages/shop/GoodsCon/index',
-        query: {
-          id: item.id
-        }
-      })
-    },
-    productItemSupplierClickHandle(item) {
-      if (!item.storeId) {
-        return
-      }
-      this.audioStopHandle()
-      this.$yrouter.push({
-        path: '/pagesInn/inn/innHome',
-        query: {
-          id: item.storeId
-        }
-      })
-    },
-    productItemBuyNowClickHandle(item) {
-      this.showGiftBtn = false
-      this.productItemBuyNowOrGiftBuy(item, 1)
-    },
-    productItemGiftBuyClickHandle(item) {
-      this.showGiftBtn = true
-      this.productItemBuyNowOrGiftBuy(item, 2)
-    },
-    productItemBuyNowOrGiftBuy(item, BuyNowOrGiftBuyType) {
-      this.audioStopHandle()
-      this.cart_num = 1
-      this.m_id = item.id
-      getProductDetail(item.id).then(res => {
-        const { data } = res
-        this.storeInfo = {...data.storeInfo}
-        if(data.storeInfo.stock === 0) {
-          uni.showToast({
-            title: "产品库存不足，请选择其他商品",
-            icon: "none",
-            duration: 5000
-          })
-          return
-        }
-        this.isWenwan = data.isWenwan
-        this.qualifications = data.qualifications || []
-        // 给 attr 赋值，将请求回来的规格赋值给 attr
-        if (this.source !== 'pre' && this.source !== 'day' && this.source !== 'kill' && this.source !== 'spe') {
-          this.attr.productAttr = data.productAttr || []
-          this.productValueArr = []
-          for (const key in data.productValue) {
-            this.productValueArr.push({
-              attrItemkey: key,
-              ...data.productValue[key]
-            })
-          }
-          // 初始化认为所有的规格都是可以选的
-          this.attr.productAttr.map(item => {
-            item.attrValue.map(subItem => {
-              subItem.canUsed = true
-            })
-          })
-        }
-        this.attr.defaultSku = data.defaultSku
-        this.attr.defaultSkuIndex = data.defaultSkuIndex
-        this.DefaultSelect()
-        // 是否单一规格
-        const onlyOne = Object.keys(data.productValue).length === 1
-        
-        if(onlyOne) {
-          this.buyNowOrGiftBuyReq(BuyNowOrGiftBuyType)
-          return
-        }
-        this.attr.cartAttr = !this.isOpen ? true : false
-      })
-    },
-    buyNowOrGiftBuyReq(type) {
-      const _this = this
-      if (_this.buyLoading) {
-        return
-      }
-      _this.buyLoading = true
-      postCartAdd({
-        productId: _this.m_id,
-        cartNum: _this.attr.productSelect.cart_num,
-        new: 1,
-        uniqueId: _this.attr.productSelect !== undefined ? _this.attr.productSelect.unique : ''
-      }).then(function (res) {
-        try {
-          _this.closeAttrWindow()
-          const { cartId } = res.data
-          if (type === 1) {
-            uni.navigateTo({
-              url: '/pages/order/OrderSubmission/index?id=' + cartId
-            })
-            return
-          } 
-          if(type === 2) {
-            uni.navigateTo({
-              url: '/pkg_user/views/gift/gift?cartId=' + cartId
-            })
-            return
-          }
-        } catch (error) {
-          console.log(error)
-        }
-      }).catch(error => {
-        uni.showToast({
-          title: error.msg,
-          icon: "none",
-          duration: 5000
-        })
-      }).finally(() => {
-        _this.buyLoading = false
-      })
-    },
-    closeAttrWindow() {
-      this.$set(this.attr, 'cartAttr', false)
-    },
-    hotelItemClickHandle(item) {
-      this.audioStopHandle()
-      this.$yrouter.push({
-        path: '/pagesInn/inn/innHome',
-        query: {
-          id: item.id
-        }
-      })
-    },
-    ichItemClickHandle(item) {
-      this.audioStopHandle()
-      this.$yrouter.push({
-        path: '/pkg_product/views/heritage/details',
-        query: {
-          id: item.id
-        }
-      })
-    },
-    qianxianItemClickHandle(item) {
-      this.audioStopHandle()
-      this.$yrouter.push({
-        path: '/pkg_product/views/famousQianxianShop',
-        query: {
-          id: item.id
-        }
-      })
-    },
-    prizeItemClickHandle() {
-      this.audioStopHandle()
-      this.$yrouter.push({ path: '/pkg-video/views/lottery' })
-    },
-    chatErrorSetContent() {
-      this.chatMessageList[this.chatMessageListLength - 1].isError = true
-      this.chatMessageList[this.chatMessageListLength - 1].content = this.exceptionConfig.model_exception
-      this.chatMessageList[this.chatMessageListLength - 1].nodes = this.exceptionConfig.model_exception
-      this.closeWsFn()
-    },
-    closeWsFn() {
-      this.loading = false
-      if (this.chatMessageListLength) {
-        this.chatMessageList[this.chatMessageListLength - 1].showCursor = false
-      }
-      uni.closeSocket({
-        success: () => {
-          console.log('-----关闭连接')
-        }
-      })
-      this.$nextTick(() => {
-        this.scrollToBottomHandle()
-      })
-    },
-    audioStopHandle() {
-      // 强制关闭微信小程序背景音频
-      try {
-        const bgAudio = wx.getBackgroundAudioManager ? wx.getBackgroundAudioManager() : null
-        if (bgAudio && typeof bgAudio.stop === 'function') {
-          bgAudio.stop()
-          bgAudio.src = ''
-          bgAudio.title = ''
-        }
-      } catch (e) {
-        console.warn('stop background audio failed', e)
-      }
-      this.audioPlayId = ''
-      // Fix bug#4049
-      this.audioAyy = []
-      if (this.audioContext) {
-        this.audioContext.stop()
-        this.audioContext.destroy() // 强制销毁释放资源
-        this.audioContext = null
-      }
-      this.isPlayAudio = false
-    },
-    ttsHandle(item) {
-      this.audioAyy = []
-      if (this.audioContext) {
-        this.audioContext.stop()
-        // this.audioContext.destroy()
-      }
-      // 如果正在播放，点击当前播放的则认为是暂停
-      if (this.isPlayAudio && [item.conversationId, item.messageId, item.parentMessageId].includes(this.audioPlayId)) {
-        this.isPlayAudio = false
-        this.audioPlayId = ''
-        return
-      }
-      this.isPlayAudio = false
-      this.audioPlayId = item.conversationId || item.messageId || item.parentMessageId
-      const flag = 1
-      if (flag === 1) {
-        console.log(removeMarkdown(item.content).replace(/[\n\t\s]/g, ''))
-        uni.showLoading({
-          title: '合成中...'
-        })
-        this.splitAndSynthesize(removeMarkdown(item.content).replace(/[\n\t\s]/g, ''))
-      } else {
-        // 调试数据
-        this.audioAyy = [
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749075_2f71887cc48d9b3753c39d119862d4bb&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749077_0970508786c5e3edc3a68a5eb9de048c&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749079_e77cec52cc077ba981892887c3df4cdf&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749080_02db4235771f5561cdb73c06d8c67e53&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749082_534e455c5d6ac5e9a4192ecf9952851a&filekey=871027724&source=miniapp_plugin',
-          'https://ae.weixin.qq.com/cgi-bin/mmasrai-bin/getmedia?filename=1750749083_78c4a2fecad538561f81c48dc4ecd645&filekey=871027724&source=miniapp_plugin'
-        ]
-        this.playNextChunk()
-      }
-    },
-    splitAndSynthesize(text) {
-      const _this = this
-      if (text) {
-        const textLength = text.length
-        const chunkSize = 100
-        const chunk = text.slice(0, textLength > chunkSize ? chunkSize : textLength)
-        plugin.textToSpeech({
-          // 语言
-          lang: 'zh_CN',
-          tts: true,
-          // 要转换的文字
-          content: chunk,
-          success: function(res) {
-            console.log("语音文件路径：", res.filename)
-            _this.audioAyy.push(res.filename)
-            // 首次就立即播放，增强体验
-            if (!_this.isPlayAudio) {
-              _this.playNextChunk()
-            }
-            if (textLength > chunkSize) {
-              // 递归调用，播放一定要按照文本分割顺序
-              _this.splitAndSynthesize(text.substr(chunkSize, textLength))
-            } else {
-              // 最后一条合成，没有正在播放则立即播放
-              if (!_this.isPlayAudio) {
-                _this.playNextChunk()
-              }
-            }
-            uni.hideLoading()
-          },
-          fail: function(err) {
-            console.log("转换失败：", err)
-            uni.hideLoading()
-          }
-        })
-      } else {
-        if (!_this.isPlayAudio) {
-          _this.playNextChunk()
-        }
-        uni.hideLoading()
-      }
-    },
-    playNextChunk() {
-      if (!this.audioAyy.length || !this.audioPlayId) {
-        this.isPlayAudio = false
-        return
-      }
-
-      // 销毁旧实例
-      if (this.audioContext) {
-        this.audioContext.stop()
-        this.audioContext.destroy()
-        this.audioContext = null
-      }
-
-      const src = this.audioAyy.shift()
-      this.isPlayAudio = true
-
-      const audioContext = uni.createInnerAudioContext({
-        useWebAudioImplement: true // 短音频建议 true
-      })
-
-      this.audioContext = audioContext
-      audioContext.src = src
-
-      audioContext.onPlay(() => {
-        console.log('audio play:', src)
-      })
-
-      audioContext.onEnded(() => {
-        this.audioContext = null
-        audioContext.destroy()
-        this.playNextChunk()
-      })
-
-      audioContext.onError((err) => {
-        console.error('audio error', err)
-        this.audioContext = null
-        audioContext.destroy()
-        this.playNextChunk()
-      })
-
-      audioContext.play()
-    },
-    bottomToolClickHandle(item) {
-      // 非界面跳转的需要校验登录状态
-      if (!this.token && item.navType !== 'url') {
-        handleLoginFailure()
-        return
-      }
-      const idx = this.bottomTools.findIndex((i) => i.giftCardEnabled === 1)
-      if (item.giftCardEnabled === 1) {
-        // 新建会话
-        this.createNewHandle('giftChat')
-        this.$set(this, 'showGiftSteps', true)
-        if (idx > -1) {
-          this.$set(this.bottomTools[idx], 'display', false)
-        }
-        return
-      }
-      this.$set(this, 'showGiftSteps', false)
-      if (idx > -1) {
-        this.$set(this.bottomTools[idx], 'display', true)
-      }
-      if (item.navType === 'prompt') {
-        this.streamReq({
-          prompt: item.promptContent,
-          init: 0
-        })
-      }
-      if (item.navType === 'url') {
-        uni.navigateTo({
-          url: item.url
-        })
-      }
-    },
-    viewOrderTrackHandle(order) {
-      uni.navigateTo({
-        url: '/pagesOrder/order/OrderDetails/index?id=' + order.orderId
-      })
-    },
-    isGiftOptionSelected(configId, optionId) {
-      if (!this.giftSelections[configId]) return false
-      return this.giftSelections[configId].includes(optionId)
-    },
-    toggleGiftOption(configId, optionId) {
-      if (!this.giftSelections[configId]) {
-        this.$set(this.giftSelections, configId, [])
-      }
-      const index = this.giftSelections[configId].indexOf(optionId)
-      if (index > -1) {
-        this.giftSelections[configId].splice(index, 1)
-      } else {
-        this.giftSelections[configId].push(optionId)
-      }
-    },
-    prevGiftStep() {
-      if (this.currentGiftStepIndex > 0) {
-        this.currentGiftStepIndex--
-      }
-    },
-    nextGiftStep() {
-      const currentStep = this.giftBuyOptions[this.currentGiftStepIndex]
-      let hasSelection = false
-      
-      // 校验是否已选择
-      if (currentStep.type === 'option_card') {
-        const selectedIds = this.giftSelections[currentStep.id] || []
-        hasSelection = selectedIds.length > 0
-      } else if (currentStep.type === 'price_input') {
-        hasSelection = !!this.giftBudget
-      }
-
-      if (!hasSelection) {
-        uni.showToast({
-          title: '请完善信息后再点击下一步',
-          icon: 'none'
-        })
-        return
-      }
-
-      if (this.currentGiftStepIndex < this.giftBuyOptions.length - 1) {
-        this.currentGiftStepIndex++
-      } else {
-        this.finishGiftSteps()
-      }
-    },
-    skipGiftStep() {
-      if (this.currentGiftStepIndex < this.giftBuyOptions.length - 1) {
-        this.currentGiftStepIndex++
-      } else {
-        this.finishGiftSteps()
-      }
-    },
-    finishGiftSteps() {
-      if (this.giftStepLoading || this.loading) return
-      const selectedSteps = []
-      this.giftBuyOptions.forEach(step => {
-        if (step.type === 'option_card') {
-          const selectedIds = this.giftSelections[step.id] || []
-          if (selectedIds.length > 0) {
-            const selectedNames = step.options.filter(opt => selectedIds.includes(opt.id)).map(opt => opt.optionName)
-            selectedSteps.push({
-              sort: step.sort,
-              title: step.title,
-              type: step.type,
-              options: selectedNames
-            })
-          }
-        } else if (step.type === 'price_input') {
-          if (this.giftBudget) {
-            selectedSteps.push({
-              sort: step.sort,
-              title: step.title,
-              type: step.type,
-              options: [this.giftBudget]
-            })
-          }
-        }
-      })
-      console.log(selectedSteps)
-      uni.showLoading()
-      this.giftStepLoading = true
-      getGiftRecommendPrompt(selectedSteps).then(res => {
-        const { success, data } = res
-        if (success) {
-          this.showGiftSteps = false
-          this.streamReq({
-            prompt: data.prompt || '我想送礼',
-            init: 0
-          })
-          // 清空所有送礼选项
-          this.giftSelections = {}
-          this.giftBudget = ''
-          this.currentGiftStepIndex = 0
-        }
-      }).finally(() => {
-        uni.hideLoading()
-        this.giftStepLoading = false
-      })
-    }
-  }
-}

aiChat/views/history.vue

@@ -33,16 +33,6 @@
                   {{ item.prompt }}
                 </view>
               </view>
-              <view class="item-right-tools">
-                <view class="btn" @click="copyContentHandle(item.prompt)">
-                  <image
-                    :src="webUrl + '/aiChat/icon-02.png'"
-                    class="icon"
-                    mode="widthFix"
-                  />
-                  复制
-                </view>
-              </view>
             </view>
             <view v-if="item.type === -2" class="chat-message-body">
               <view class="avatar">
@@ -67,7 +57,7 @@
                       space="nbsp"
                     />
                     <view v-if="!(item.nodes && item.nodes.length) && loading" class="loader-wrap">
-                      <div class="loading2" />
+                      <div class="loader" />
                     </view>
                   </view>
                   <view
@@ -107,90 +97,17 @@
                       />
                       重新生成
                     </view>
-                    <view
-                      :class="{
-                        'playing': [item.conversationId, item.messageId, item.parentMessageId].includes(audioPlayId) && isPlayAudio
-                      }"
-                      class="item"
-                      @click="ttsHandle(item)"
-                    >
-                      <image
-                        :src="webUrl + '/aiChat/' + (([item.conversationId, item.messageId, item.parentMessageId].includes(audioPlayId) && isPlayAudio) ? 'audio-on' : 'audio-off') +'.png'"
-                        class="icon"
-                        mode="widthFix"
-                      />
-                      语音播放
-                    </view>
                   </view>
                 </view>
               </view>
               <!-- 换一换 -->
               <view
-                v-if="!item.showCursor &&
+                v-if="item.showMoreInfo.show"
-                  !item.isError &&
-                  (item.orderList.length > 0 ||
-                    item.giftGoodsList.length > 0 ||
-                    item.goodsList.length > 0 ||
-                    item.shopList.length > 0 || 
-                    item.prizeList.length > 0 ||
-                    item.ichList.length > 0 ||
-                    item.qianxianList.length > 0
-                  )
-                "
                 class="change-list-wrap"
               >
-                <!-- 礼品 -->
+                <view v-if="item.showMoreInfo.showType === '特产商品'" class="list-wrap">
-                <view
-                  v-if="item.giftGoodsList.length > 0"
-                  class="recommend-goods-wrap"
-                >
-                  <swiper
-                    class="goods-swiper"
-                    :indicator-dots="false"
-                    :autoplay="false"
-                    :current="item.currentSwiperIndex"
-                    previous-margin="120rpx"
-                    next-margin="120rpx"
-                    circular
-                    @change="e => onSwiperChange(index, e)"
-                  >
-                    <swiper-item
-                      v-for="(goodItem, goodIndex) in item.giftGoodsList"
-                      :key="goodIndex"
-                    >
-                      <view
-                        :class="{ 'active': item.currentSwiperIndex === goodIndex }"
-                        class="goods-item"
-                        @click="productItemClickHandle(goodItem)"
-                      >
-                        <view class="supplier" @click.stop="productItemSupplierClickHandle(goodItem)">
-                          <image
-                            :src="webUrl + '/aiChat/icon-57.png'"
-                            class="icon"
-                            mode="widthFix"
-                            lazy-load
-                          />
-                          <text class="s-name">{{ goodItem.merName ||goodItem.storeName }}</text>
-                          <u-icon name="arrow-right" color="#999" size="12"></u-icon>
-                        </view>
-                        <view class="title one-t">{{ goodItem.name }}</view>
-                        <image :src="goodItem.img" class="p-img" mode="aspectFill" lazy-load  />
-                        <view class="price">
-                          <text class="unit">￥</text>
-                          <text class="num">{{ goodItem.price }}</text>
-                        </view>
-                        <view class="actions">
-                          <view class="btn-buy" @click.stop="productItemBuyNowClickHandle(goodItem)">立即下单</view>
-                          <view class="btn-gift" @click.stop="productItemGiftBuyClickHandle(goodItem)">送给朋友</view>
-                        </view>
-                      </view>
-                    </swiper-item>
-                  </swiper>
-                </view>
-                <!-- 特产商品 -->
-                <view v-if="item.goodsList.length > 0" class="list-wrap">
                   <view
-                    v-for="(productItem, productIndex) in item.goodsList"
+                    v-for="(productItem, productIndex) in item.showMoreInfo.resultItems"
                     :key="productIndex"
                     class="product-item"
                     @click="productItemClickHandle(productItem)"
@@ -198,7 +115,6 @@
                     <image
                       :src="productItem.img"
                       class="img"
-                      lazy-load
                     />
                     <view class="product-info">
                       <view class="name one-t">
@@ -213,21 +129,19 @@
                     </view>
                   </view>
                 </view>
-                <!-- 店铺 -->
+                <view v-if="item.showMoreInfo.showType === '店铺'" class="list-wrap">
-                <view v-if="item.shopList.length > 0" class="list-wrap">
                   <view
-                    v-for="(hotel, hotelIndex) in item.shopList"
+                    v-for="(hotel, hotelIndex) in item.showMoreInfo.resultItems"
                     :key="hotelIndex"
                     class="product-item"
                     @click="hotelItemClickHandle(hotel)"
                   >
                     <view class="hotel-type">
-                      {{ hotel.hotelTypeName }}
+                      手工体验
                     </view>
                     <image
-                      :src="hotel.img + ((hotel.img && hotel.img.indexOf('.mp4') > -1) ? '?vframe/jpg/offset/1' : '')"
+                      :src="hotel.img"
                       class="img"
-                      lazy-load
                     />
                     <view class="product-info">
                       <view class="name one-t">
@@ -239,10 +153,9 @@
                     </view>
                   </view>
                 </view>
-                <!-- 非遗 -->
+                <view v-if="item.showMoreInfo.showType === '非遗文化'" class="list-wrap">
-                <view v-if="item.ichList.length > 0" class="list-wrap">
                   <view
-                    v-for="(ich, ichIndex) in item.ichList"
+                    v-for="(ich, ichIndex) in item.showMoreInfo.resultItems"
                     :key="ichIndex"
                     class="product-item"
                     @click="ichItemClickHandle(ich)"
@@ -261,10 +174,9 @@
                     </view>
                   </view>
                 </view>
-                <!-- 千县 -->
+                <view v-if="item.showMoreInfo.showType === '千县名品'" class="list-wrap">
-                <view v-if="item.qianxianList.length > 0" class="list-wrap">
                   <view
-                    v-for="(qianxian, qianxianIndex) in item.qianxianList"
+                    v-for="(qianxian, qianxianIndex) in item.showMoreInfo.resultItems"
                     :key="qianxianIndex"
                     class="product-item"
                     @click="qianxianItemClickHandle(qianxian)"
@@ -272,7 +184,6 @@
                     <image
                       :src="qianxian.img"
                       class="img"
-                      lazy-load
                     />
                     <view class="product-info">
                       <view class="name name2 one-t">
@@ -281,59 +192,15 @@
                     </view>
                   </view>
                 </view>
-                <!-- 抽奖 -->
+                <view class="change-btn">
-                <view v-if="item.prizeList.length > 0" class="list-wrap prize-list-wrap">
+                  <image
-                  <view
+                    :src="webUrl + '/aiChat/icon-change.png'"
-                    v-for="(prize, prizeIndex) in item.prizeList"
+                    class="icon"
-                    :key="prizeIndex"
+                    mode="widthFix"
-                    class="prize-item"
+                    @click="analyzeKeywordsChangeHandle(item.conversationId, item.showMoreInfo)"
-                    @click="prizeItemClickHandle(prize)"
+                  />
-                  >
-                    <image
-                      :src="prize.img"
-                      class="img"
-                      mode="widthFix"
-                      lazy-load
-                    />
-                  </view>
-                </view>
-                <!-- 订单 -->
-                <view v-if="item.orderList.length > 0" class="order-list-wrap">
-                  <view
-                    v-for="(order, orderIndex) in item.orderList"
-                    :key="orderIndex"
-                    class="order-item-wrap"
-                  >
-                    <order-item
-                      :item="order"
-                      @viewOrderTrack="viewOrderTrackHandle"
-                    />
-                  </view>
-                </view>
-                <view
-                  v-if="(item.shopList.length > 0 ||
-                    item.goodsList.length > 0 ||
-                    item.giftGoodsList.length > 0 ||
-                    item.ichList.length > 0 ||
-                    item.qianxianList.length > 0 ||
-                    item.shopList.length > 0) && item.showChangeBtn
-                  "
-                  class="change-btn"
-                >
-                  <view class="change-btn-content" @click="analyzeKeywordsChangeHandle(item.conversationId, item)">
-                    <image
-                      :src="webUrl + '/aiChat/icon-53.png'"
-                      :class="{
-                        'rotate': item.changeIsRotate
-                      }"
-                      class="icon"
-                      mode="widthFix"
-                    />
-                    换一换
-                  </view>
                 </view>
               </view>
-              <!-- 建议提问 -->
               <view
                 v-if="index === (chatMessageListLength - 1) && item.listQuestion.length > 0"
                 class="suggestion-wrap"
@@ -370,57 +237,29 @@
       }"
       class="page-to-bottom"
     >
-      <view class="down-icon-wrap">
-        <image
-          v-if="chatMessageListLength > 0 && !isScrollToBottom && !loading"
-          :src="webUrl + '/aiChat/down.png'"
-          class="icon down-icon"
-          mode="widthFix"
-          @click="scrollToBottomHandle"
-        />
-      </view>
       <view
-        :class="{
+        class="new-chat"
-          'container-county': !!countyId
+        @click="createNewHandle"
-        }"
-        class="container"
       >
-        <view
+        <image
-          v-if="chatNumber"
+          :src="webUrl + '/aiChat/icon-05.png'"
-          class="new-chat"
+          class="btn-icon"
-          @click="createNewHandle"
+          mode="widthFix"
-        >
+        />
-          <image
+        开启新对话
-            :src="webUrl + '/aiChat/icon-54.png'"
-            class="btn-icon"
-            mode="widthFix"
-          />
-          开启新对话
-        </view>
-        <view
-          v-if="!countyId"
-          v-for="(item, index) in bottomTools"
-          :key="index"
-          :class="{
-            'hide': !item.display
-          }"
-          class="bottom-tool-item"
-          @click="bottomToolClickHandle(item)"
-        >
-          <image
-            :src="item.icon"
-            class="tool-icon"
-            mode="widthFix"
-          />
-          {{ item.name }}
-        </view>
       </view>
+      <image
+        v-if="chatMessageListLength > 0 && !isScrollToBottom && !loading"
+        :src="webUrl + '/aiChat/down.png'"
+        class="icon"
+        mode="widthFix"
+        @click="scrollToBottomHandle"
+      />
     </view>
     <bottom-send
       ref="bottomSend"
       :loading="loading"
       :keyboard-height="keyboardHeight"
-      :voice-exception="exceptionConfig.voice_exception"
       @send="streamReq"
       @history="historyViewHandle"
       @focus="inputFocusHandle"
@@ -428,70 +267,41 @@
     <AiHistoryList
       ref="historyView"
       :status-bar-height="statusBarHeight"
-      :county-id="countyId"
       form-module="history"
-      @enter-history="audioStopHandle"
-    />
-    <ProductWindow
-      ref="attrWindow"
-      :attr="attr"
-      :cart-num="cart_num"
-      :show-ok="!showGiftBtn"
-      :is-gift="showGiftBtn"
-      :padding-bottom="'60px'"
-      class-name="ai-product-window"
-      ok-text="立即购买"
-      @changeFun="changeFun"
-      @ok="buyNowOrGiftBuyReq(1)"
-      @gift="buyNowOrGiftBuyReq(2)"
     />
   </view>
 </template>
 
 <script>
-import { chatMixinsV2 } from '../mixins/chatMixinsV2.js'
+import { chatMixins } from '../mixins/chatMixins.js'
-import goCartMixin from '@/mixins/goCartMixins'
 import AiHistoryList from '../components/historyList'
 import BottomSend from '../components/bottomSend.vue'
-import OrderItem from '../components/orderItem.vue'
-import ProductWindow from '@/components/ProductWindow'
 import {
-  historyChatMessage,
+  historyChatMessage
-  getCountyAiHistoryChatMessage
 } from '@/api/chat/index'
 import { formatAiMsgContent } from '../utils/aiChat'
 export default {
   name: 'AiChatHistoryPage',
   components: {
     AiHistoryList,
-    BottomSend,
+    BottomSend
-    OrderItem,
-    ProductWindow
   },
-  mixins: [chatMixinsV2, goCartMixin],
+  mixins: [chatMixins],
   data() {
     return {
-      pageTitle: '',
+      pageTitle: ''
-      countyId: ''
     }
   },
   onLoad(options) {
     this.chatNumber = options.chatNumber
-    this.pageTitle = options.title || ''
+    this.pageTitle = options.title
-    this.countyId = options.countyId || ''
     this.pageTitle = this.pageTitle.length > 8 ? (this.pageTitle.substring(0, 8) + '...') : this.pageTitle
     this.init()
   },
   methods: {
     init() {
       this.loading = true
-      let reqFn = null
+      historyChatMessage({
-      if (this.countyId) {
-        reqFn = getCountyAiHistoryChatMessage
-      } else {
-        reqFn = historyChatMessage
-      }
-      reqFn({
         chatNumber: this.chatNumber
       }).then(res => {
         const { success, data = [] } = res
@@ -505,71 +315,19 @@ export default {
                   prompt: item.content
                 })
               } else {
-                if (['text', 'skill_list'].includes(item.contentType)) {
+                if (item.contentType === 'text') {
-                  const tempItemData = {
+                  this.chatMessageList.push({
                     ...item,
                     nodes: formatAiMsgContent(item.content),
                     prompt: this.getParentPrompt(data, item.parentMessageId),
                     conversationId: item.messageId,
                     showCursor: false,
                     listQuestion: item.listQuestion || [],
-                    // 特产商品
+                    type: -2
-                    goodsList: [],
+                  })
-                    // 礼品商品
-                    giftGoodsList: [],
-                    // 非遗文化
-                    ichList: [],
-                    // 千县名品
-                    qianxianList: [],
-                    // 抽奖
-                    prizeList: [],
-                    // 店铺
-                    shopList: [],
-                    // 地标好物--屏蔽原因：实现此功能时，后端通过AI动态返回的图片不满足需求，后面就不要了
-                    landmarksList: [],
-                    // 订单
-                    orderList: [],
-                    type: -2,
-                    showMoreInfo: {},
-                    currentSwiperIndex: 0,
-                    showChangeBtn: false,
-                    changeIsRotate: false
-                  }
-                  if (item.cardData) {
-                    const { contentType, finish, items = [] } = item.cardData
-                    if (contentType === 'order') {
-                      tempItemData.orderList = items || []
-                    }
-                    if (contentType === 'shop') {
-                      tempItemData.shopList = items || []
-                    }
-                    if (contentType === 'gift') {
-                      tempItemData.giftGoodsList = items || []
-                    }
-                    if (contentType === 'discount') {
-                      tempItemData.prizeList = items || []
-                    }
-                    if (contentType === 'goods') {
-                      tempItemData.goodsList = items || []
-                    }
-                    if (contentType === 'famous') {
-                      tempItemData.qianxianList = items || []
-                    }
-                    if (contentType === 'ich') {
-                      tempItemData.ichList = items || []
-                    }
-                    if (contentType === 'landmarks') {
-                      tempItemData.landmarksList = items || []
-                    }
-                  }
-                  this.chatMessageList.push(tempItemData)
                 }
               }
             })
-            console.log(this.chatMessageList)
-            this.$nextTick(() => {
-              this.scrollToBottomHandle()
-            })
           } catch (err) {
             uni.showModal({
               title: '错误提示',
@@ -595,24 +353,6 @@ export default {
     createNewHandle() {
       uni.setStorageSync('addNewChat', '1')
       uni.navigateBack()
-    },
-    bottomToolClickHandle(item) {
-      if (item.giftCardEnabled === 1) {
-        uni.setStorageSync('addNewChat', '2')
-        uni.navigateBack()
-        return
-      }
-      if (item.navType === 'prompt') {
-        this.streamReq({
-          prompt: item.promptContent,
-          init: 0
-        })
-      }
-      if (item.navType === 'url') {
-        uni.navigateTo({
-          url: item.url
-        })
-      }
     }
   }
 }

aiChat/views/imageRecognition.vue

@@ -1,227 +0,0 @@
-<template>
-  <view
-    :style="{ 'background-image': 'url(' + webUrl + '/aiChat/bg-05.png)' }"
-    class="image-recognition-page"
-  >
-    <hx-navbar
-      :back="true"
-      :fixed="true"
-      :statusBar="true"
-      left-icon="arrowleft"
-      color="#333"
-      transparent="auto"
-      barPlaceholder="hidden"
-      title="云灵"
-    />
-    
-    <view 
-      class="main-content" 
-      :style="{ 'padding-top': (44 + statusBarHeight) + 'px' }"
-    >
-      <!-- 拍照区域 -->
-      <view class="camera-section" @click="takePhoto">
-        <view class="dashed-border-box">
-          <view class="icon-wrap">
-            <image 
-              :src="webUrl + '/aiChat/icon-55.png'" 
-              class="camera-icon" 
-              mode="widthFix"
-            />
-          </view>
-          <view class="main-title">对准商品拍照</view>
-          <view class="sub-tip">示例：特产/零食/茶叶/纪念品</view>
-        </view>
-      </view>
-      
-      <!-- 底部相册上传按钮 -->
-      <view class="bottom-action">
-        <button class="album-btn" @click="chooseImage">
-          <image 
-            :src="webUrl + '/aiChat/icon-56.png'" 
-            class="upload-icon" 
-            mode="widthFix"
-          />
-          <text>从相册上传图片进行识别</text>
-        </button>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { chatMixins } from '../mixins/chatMixins.js'
-import { VUE_APP_API_URL } from '@/config'
-
-export default {
-  name: 'AiChatImageRecognitionPage',
-  mixins: [chatMixins],
-  data() {
-    return {
-    }
-  },
-  methods: {
-    createdCallbak() {
-      // 覆盖 mixins 中的 createdCallbak，避免触发默认逻辑
-    },
-    takePhoto() {
-      if (this.loading) return
-      uni.chooseImage({
-        count: 1,
-        sizeType: ['compressed'],
-        sourceType: ['camera'],
-        success: (res) => {
-          this.handleUpload(res.tempFilePaths[0])
-        }
-      })
-    },
-    chooseImage() {
-      if (this.loading) return
-      uni.chooseImage({
-        count: 1,
-        sizeType: ['compressed'],
-        sourceType: ['album'],
-        success: (res) => {
-          this.handleUpload(res.tempFilePaths[0])
-        }
-      })
-    },
-    handleUpload(filePath) {
-      const _this = this
-      uni.showLoading({ title: '识别中...' })
-      _this.loading = true
-      
-      uni.uploadFile({
-        url: `${VUE_APP_API_URL}/api/upload`,
-        filePath: filePath,
-        header: {
-          Authorization: 'Bearer ' + (_this.token || '')
-        },
-        name: 'file',
-        success: (uploadRes) => {
-          const resData = JSON.parse(uploadRes.data)
-          if (resData.link) {
-            _this.performRecognition(resData.link)
-          } else {
-            uni.hideLoading()
-            _this.loading = false
-            _this.$toast('上传失败，请重试')
-          }
-        },
-        fail: (err) => {
-          console.log('Upload Error:', err)
-          uni.hideLoading()
-          _this.loading = false
-          _this.$toast('网络异常，请重试')
-        }
-      })
-    },
-    performRecognition(imageUrl) {
-      // 存储识别到的图片URL
-      uni.setStorageSync('recognitionImage', imageUrl)
-      uni.navigateTo({
-        url: '/aiChat/views/imageRecognitionResult'
-      })
-      uni.hideLoading()
-      this.loading = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.image-recognition-page {
-  height: 100vh;
-  background-size: 100% 100%;
-  
-  .main-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 60rpx 40rpx;
-    height: 100vh;
-    box-sizing: border-box;
-  }
-  
-  .camera-section {
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-bottom: 60rpx;
-    
-    .dashed-border-box {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      height: 600rpx;
-      width: 100%;
-      margin-top: 80rpx;
-      border: 2rpx dashed #DCDFE6;
-      border-radius: 24rpx;
-      background-color: rgba(255, 255, 255, 0.5);
-      
-      .icon-wrap {
-        width: 160rpx;
-        height: 160rpx;
-        border-radius: 50%;
-        border: 6rpx solid #7A3DF1;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-bottom: 40rpx;
-        
-        .camera-icon {
-          width: 80rpx;
-          height: 80rpx;
-        }
-      }
-      
-      .main-title {
-        font-size: 36rpx;
-        font-weight: bold;
-        color: #333;
-        margin-bottom: 20rpx;
-      }
-      
-      .sub-tip {
-        font-size: 28rpx;
-        color: #999;
-      }
-    }
-  }
-  
-  .bottom-action {
-    width: 100%;
-    padding-bottom: 60rpx;
-    
-    .album-btn {
-      width: 100%;
-      height: 100rpx;
-      background: #3D4CF1;
-      border-radius: 20rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      color: #FFFFFF;
-      font-size: 32rpx;
-      border: none;
-      box-shadow: 0 8rpx 20rpx rgba(61, 76, 241, 0.3);
-      
-      .upload-icon {
-        width: 36rpx;
-        height: 36rpx;
-        margin-right: 16rpx;
-      }
-      
-      &::after {
-        border: none;
-      }
-      
-      &:active {
-        opacity: 0.8;
-      }
-    }
-  }
-}
-</style>

aiChat/views/imageRecognitionResult.vue

@@ -1,358 +0,0 @@
-<template>
-  <view class="image-recognition-result-page">
-    <view
-      class="page-body"
-    >
-      <view class="header">
-        <view
-          class="header-bg"
-          :style="{ 'background-image': imageUrl ? `url(${imageUrl})` : '' }"
-        />
-        <view class="header-mask" />
-        <view class="scan-wrap">
-          <image
-            v-if="imageUrl"
-            :src="imageUrl"
-            class="scan-image"
-            mode="aspectFill"
-          />
-          <view class="corner tl" />
-          <view class="corner tr" />
-          <view class="corner bl" />
-          <view class="corner br" />
-        </view>
-      </view>
-
-      <view class="sheet">
-        <view class="sheet-thumb-row">
-          <image
-            v-if="imageUrl && confidenceFlag"
-            :src="imageUrl"
-            class="sheet-thumb"
-            mode="aspectFill"
-            lazy-load
-          />
-          <view v-else class="empty-state">
-            <view class="empty-text">未识别到物品，请重新尝试</view>
-            <view class="empty-title">为你推荐</view>
-          </view>
-        </view>
-        <view class="sheet-divider" />
-        <view v-if="!loaded" class="loading-state">
-          <u-loading-icon mode="circle" size="36" text="正在识别中..." vertical textSize="14"></u-loading-icon>
-        </view>
-        <view v-else class="goods-grid">
-          <view
-            v-for="(item, index) in goodsList"
-            :key="index"
-            class="goods-card"
-            @click="goGoods(item)"
-          >
-            <image
-              :src="item.img"
-              class="goods-img"
-              mode="aspectFill"
-              lazy-load
-            />
-            <view class="goods-title">
-              {{ item.name }}
-            </view>
-            <view class="goods-price-row">
-              <view class="price-left">
-                <text class="price-symbol">￥</text>
-                <text class="price-val">{{ item.price }}</text>
-              </view>
-              <image
-                :src="webUrl + '/home/icon-cart.png'"
-                class="cart-btn"
-                mode="aspectFit"
-                lazy-load
-              />
-            </view>
-            <view v-if="item.similarityScore > 0" class="goods-desc">
-              相似度{{ item.similarityScore }}%
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { getAnalyzeByImageV3 } from '@/api/chat'
-import Recommend from '@/components/Recommend'
-
-export default {
-  name: 'AiChatImageRecognitionResultPage',
-  components: {
-    Recommend
-  },
-  data() {
-    return {
-      loaded: false,
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      statusBarHeight: 20,
-      imageUrl: '',
-      goodsList: [],
-      confidenceFlag: true
-    }
-  },
-  onLoad(options) {
-    const urlFromQuery = options.imageUrl || ''
-    const urlFromStorage = uni.getStorageSync('recognitionImage') || ''
-    this.imageUrl = urlFromQuery || urlFromStorage || ''
-    if (urlFromStorage) {
-      // uni.removeStorageSync('recognitionImage')
-    }
-    this.init()
-  },
-  methods: {
-    init() {
-      this.loaded = false
-      getAnalyzeByImageV3({
-        imageUrl: this.imageUrl
-      }).then(res => {
-        const { data, success } = res
-        if (success) {
-          this.goodsList = data.cards || []
-          this.confidenceFlag = data.success
-        }
-      }).finally(() => {
-        this.loaded = true
-      })
-    },
-    goGoods(item) {
-      if (!item || !item.id) return
-      uni.navigateTo({
-        url: `/pages/shop/GoodsCon/index?id=${item.id}`
-      })
-    },
-    addToCart() {
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.image-recognition-result-page {
-  min-height: 100vh;
-  background: #fff;
-
-  .page-body {
-    min-height: 100vh;
-  }
-
-  .header {
-    position: relative;
-    height: 480rpx;
-    overflow: hidden;
-  }
-
-  .header-bg {
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    background-color: #DDE6FF;
-    background-size: cover;
-    background-position: center;
-    filter: blur(18rpx);
-    transform: scale(1.2);
-  }
-
-  .header-mask {
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.18);
-  }
-
-  .scan-wrap {
-    position: absolute;
-    left: 50%;
-    top: 45%;
-    width: 320rpx;
-    height: 320rpx;
-    transform: translate(-50%, -52%);
-    border-radius: 24rpx;
-    overflow: hidden;
-    // box-shadow: 0 18rpx 48rpx rgba(0, 0, 0, 0.18);
-  }
-
-  .scan-image {
-    display: block;
-    width: 100%;
-    height: 100%;
-    border-radius: 12rpx;
-    transform: scale(0.8);
-  }
-
-  .corner {
-    position: absolute;
-    width: 44rpx;
-    height: 44rpx;
-    border: 6rpx solid rgba(255, 255, 255, 0.95);
-  }
-
-  .corner.tl {
-    left: 16rpx;
-    top: 16rpx;
-    border-right: 0;
-    border-bottom: 0;
-  }
-  .corner.tr {
-    right: 16rpx;
-    top: 16rpx;
-    border-left: 0;
-    border-bottom: 0;
-  }
-  .corner.bl {
-    left: 16rpx;
-    bottom: 16rpx;
-    border-right: 0;
-    border-top: 0;
-  }
-  .corner.br {
-    right: 16rpx;
-    bottom: 16rpx;
-    border-left: 0;
-    border-top: 0;
-  }
-
-  .sheet {
-    position: relative;
-    margin-top: -70rpx;
-    background: #FFFFFF;
-    border-top-left-radius: 42rpx;
-    border-top-right-radius: 42rpx;
-    padding-bottom: calc(env(safe-area-inset-bottom) + 28rpx);
-  }
-
-  .sheet-thumb-row {
-    padding: 28rpx 0 18rpx 0;
-    display: flex;
-    justify-content: center;
-  }
-
-  .sheet-thumb {
-    width: 100rpx;
-    height: 100rpx;
-    border-radius: 18rpx;
-    display: block;
-    box-shadow: 0 10rpx 24rpx rgba(0, 0, 0, 0.12);
-  }
-
-  .sheet-divider {
-    height: 2rpx;
-    background: #EDEDED;
-    margin: 0 32rpx;
-  }
-
-  .loading-state {
-    padding: 120rpx 0;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .empty-state {
-    text-align: center;
-  }
-
-  .empty-text {
-    font-size: 28rpx;
-    color: #999;
-    margin-bottom: 20rpx;
-  }
-  .empty-title {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: #333;
-    margin-bottom: 20rpx;
-  }
-
-  .goods-grid {
-    padding: 28rpx 24rpx 0 24rpx;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-  }
-
-  .goods-card {
-    width: 344rpx;
-    background: #FFFFFF;
-    border-radius: 22rpx;
-    overflow: hidden;
-    margin-bottom: 22rpx;
-    box-shadow: 0 10rpx 24rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .goods-img {
-    width: 344rpx;
-    height: 344rpx;
-    display: block;
-  }
-
-  .goods-title {
-    padding: 14rpx 14rpx 0 14rpx;
-    font-size: 28rpx;
-    line-height: 38rpx;
-    color: #333;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    min-height: 76rpx;
-  }
-
-  .goods-price-row {
-    padding: 10rpx 14rpx 16rpx 14rpx;
-    display: flex;
-    align-items: flex-end;
-    justify-content: space-between;
-  }
-  .goods-desc {
-    padding: 10rpx 14rpx 20rpx 14rpx;
-    font-size: 24rpx;
-    color: #999;
-    line-height: 1;
-  }
-
-  .price-left {
-    display: flex;
-    align-items: flex-end;
-  }
-
-  .price-symbol {
-    font-size: 26rpx;
-    color: #C52733;
-    line-height: 1;
-    margin-right: 2rpx;
-  }
-
-  .price-val {
-    font-size: 40rpx;
-    font-weight: bold;
-    color: #C52733;
-    line-height: 1;
-  }
-
-  .origin-price {
-    font-size: 24rpx;
-    color: #999;
-    line-height: 1;
-    margin-left: 12rpx;
-    text-decoration: line-through;
-  }
-
-  .cart-btn {
-    width: 52rpx;
-    height: 52rpx;
-    display: block;
-  }
-}
-</style>

aiChat/views/index.vue

@@ -1,9 +1,6 @@
 <template>
   <view
-    :class="{
+    :class="scrollTop > 0 ? 'page-scroll' : ''"
-      'page-scroll': scrollTop > 0,
-      'new-chat': chatMessageListLength === 0
-    }"
     class="fix-tabbar-page"
   >
     <hx-navbar
@@ -15,8 +12,8 @@
       color="#333"
       transparent="auto"
       barPlaceholder="hidden"
-      title="云灵"
+      title="云灵AI智能助手"
-      @click-left="pageContainerBeforeleave"
+      @click-left="clickBackHandle"
     />
     <page-container
       :show="true"
@@ -35,172 +32,65 @@
       }"
       class="fix-tabbar-body"
     >
-      <!-- <button @click="ttsHandle({
-        content: '是否使用 WebAudio 作为底层音频驱动，默认关闭。对于短音频、播放频繁的音频建议开启此选项，开启后将获得更优的性能表现。由于开启此选项后也会带来一定的内存增长，因此对于长音频建议关闭此选项。临床试验统计分析结果生成系统是服务于医学研究的数据处理平台。系统聚焦临床试验数据，可对患者入组信息、疗效指标、安全性数据等进行标准化统计分析，自动生成包含描述性统计、假设检验、生存分析等内容的结果报告。支持可视化图表输出，如疗效对比柱状图、不良事件分布饼图等，直观呈现数据特征。具备灵活的参数配置功能，可适配不同试验设计与分析需求，助力研究者高效完成数据解读，为药物研发、临床研究结论输出提供精准的统计支持。',
-        conversationId: '123'
-      })">播放</button> -->
       <block v-if="chatMessageListLength < 1">
-        <view
+        <view class="home-focus-wrap">
-          :class="{
+          <view class="focus-guide-wrap">
-            'county-home-wrap': !!countyId
+            <view class="guide-left">
-          }"
+              <image
-          class="home-wrap"
+                :src="webUrl + '/aiChat/logo-01.gif'"
-        >
+                class="avatar"
-          <view class="home-focus-wrap">
+                mode="widthFix"
-            <view class="focus-guide-wrap">
+              />
-              <view class="guide-left">
+            </view>
-                <image
+            <view class="guide-right">
-                  :src="webUrl + '/aiChat/logo-transition.png'"
+              <view class="trangle" />
-                  :class="{
+              <view class="title">{{ settingInfo.helloMessageTitle }}</view>
-                    'county-avatar': !!countyId
+              <view class="content">{{ settingInfo.helloMessageContent }}</view>
-                  }"
-                  class="avatar avatar-bounce"
-                  mode="widthFix"
-                />
-              </view>
-              <view v-if="!showGiftSteps" class="guide-right">
-                <view class="title">{{ settingInfo.helloMessageTitle }}</view>
-                <view class="content">{{ settingInfo.helloMessageContent }}</view>
-              </view>
             </view>
           </view>
-          <!-- 这里实现商品轮播 -->
+        </view>
-          <!-- <view class="recommend-goods-wrap" v-if="recommendGoodsList.length > 0">
+        <view class="topic-wrap">
-            <swiper 
+          <view class="title">
-              class="goods-swiper" 
+            <image
-              :indicator-dots="false" 
+              :src="webUrl + '/aiChat/icon-01.png'"
-              :autoplay="false" 
+              class="icon"
-              previous-margin="120rpx" 
+              mode="widthFix"
-              next-margin="120rpx" 
+            />
-              circular
+            <view class="txt">#大家都在问</view>
-              @change="onSwiperChange"
+            <image
+              :src="webUrl + '/aiChat/icon-01.png'"
+              class="icon"
+              mode="widthFix"
+            />
+          </view>
+          <view class="list-wrap">
+            <view
+              :style="{
+                'width': animationWidth,
+                'animation': animationStr
+              }"
+              class="list-cont"
             >
-              <swiper-item 
-                v-for="(item, index) in recommendGoodsList" 
-                :key="index"
-              >
-                <view 
-                  class="goods-item" 
-                  :class="{ 'active': currentSwiperIndex === index }"
-                  @click="productItemClickHandle(item)"
-                >
-                  <view class="supplier">
-                    <image
-                      :src="webUrl + '/aiChat/icon-57.png'"
-                      class="icon"
-                      mode="widthFix"
-                    />
-                    <text class="s-name">{{ item.supplierName || '供应商名称' }}</text>
-                    <u-icon name="arrow-right" color="#999" size="12"></u-icon>
-                  </view>
-                  <view class="title one-t">{{ item.productName || item.name || '商品名称' }}</view>
-                  <image :src="item.image || item.img" class="p-img" mode="aspectFill" />
-                  <view class="price">
-                    <text class="unit">￥</text>
-                    <text class="num">{{ item.price || '0.00' }}</text>
-                  </view>
-                  <view class="actions">
-                    <view class="btn-buy" @click.stop="productItemBuyNowClickHandle(item)">立即下单</view>
-                    <view class="btn-gift" @click.stop="productItemGiftBuyClickHandle(item)">送给朋友</view>
-                  </view>
-                </view>
-              </swiper-item>
-            </swiper>
-          </view> -->
-          <!-- 大家都在问 -->
-          <view v-if="!showGiftSteps && !countyId" class="topic-wrap">
-            <view class="title">
-              <view class="title-left">大家都在问</view>
-              <view class="title-right" @click="loadData('click')">
-                <image
-                  :src="webUrl + '/aiChat/icon-53.png'"
-                  :class="{
-                    'rotate': topicIsRotate
-                  }"
-                  class="icon"
-                  mode="widthFix"
-                />
-                换一换
-              </view>
-            </view>
-            <view class="list-wrap">
-              <view class="list-cont">
-                <view
-                  v-for="(item, index) in topicList"
-                  :key="index"
-                  class="list-item"
-                  @click="topicItemClickHandle(item.title)"
-                >
-                  <image
-                    v-if="item.isHot"
-                    :src="webUrl + '/aiChat/hot.png'"
-                    class="icon"
-                    mode="widthFix"
-                  />
-                  {{ item.title }}
-                </view>
-              </view>
-            </view>
-          </view>
-          <!-- 县域 -->
-          <view v-if="!showGiftSteps && countyId" class="county-tools-wrap">
-            <view class="list-cont">
               <view
-                v-for="(item, index) in countyTools"
+                v-for="(item, index) in topicList"
                 :key="index"
                 class="list-item"
-                @click="countyToolItemClickHandle(item)"
+                @click="topicItemClickHandle(item.title)"
               >
                 <image
-                  :src="item.icon"
+                  v-if="item.isHot"
+                  :src="webUrl + '/aiChat/hot.png'"
                   class="icon"
                   mode="widthFix"
                 />
-                <view class="name">{{ item.name }}</view>
+                {{ item.title }}
               </view>
             </view>
           </view>
-          <!-- 在这里实现送礼步骤 -->
-          <view v-if="showGiftSteps" class="gift-steps-wrap">
-            <view
-              v-for="(item, index) in giftBuyOptions"
-              :key="index"
-              style="width: 100%;"
-            >
-            <view v-show="currentGiftStepIndex === index" class="gift-step-item">
-              <view class="gift-step-title">{{ item.title }}</view>
-                <view v-if="item.type === 'option_card'" class="gift-options">
-                  <view 
-                    v-for="opt in item.options"
-                    :key="opt.id"
-                    class="gift-option-item"
-                    :class="{ active: isGiftOptionSelected(item.id, opt.id) }"
-                    @click="toggleGiftOption(item.id, opt.id)"
-                  >
-                    {{ opt.optionName }}
-                    <image v-if="isGiftOptionSelected(item.id, opt.id)" :src="webUrl + '/aiChat/gift-options-check.png'" class="icon-check" />
-                  </view>
-                </view>
-                <view v-if="item.type === 'price_input'" class="gift-price-input">
-                  <view class="input-wrap">
-                    <text class="label">价格预算：</text>
-                    <input v-model="giftBudget" placeholder="例如100以内/300~500元" class="input-budget" placeholder-style="color: #ccc;" />
-                  </view>
-                </view>
-              </view>
-            </view>
-            <view class="gift-step-actions">
-              <view class="action-btn-group">
-                <view v-if="currentGiftStepIndex > 0" class="btn btn-prev" @click="prevGiftStep">上一步</view>
-                <view class="btn btn-next" :class="{'full-width': currentGiftStepIndex === 0}" @click="nextGiftStep">下一步</view>
-              </view>
-              <view class="btn-skip" @click="skipGiftStep">跳过</view>
-            </view>
-          </view>
         </view>
       </block>
-      <view v-if="chatMessageListLength > 0" class="chat-wrap">
+      <view class="chat-wrap">
-        <view class="chat-list-wrap">
+        <view v-if="chatMessageListLength > 0" class="chat-list-wrap">
           <view
             v-for="(item, index) in chatMessageList"
             :key="index"
@@ -212,16 +102,6 @@
                   {{ item.prompt }}
                 </view>
               </view>
-              <view class="item-right-tools">
-                <view class="btn" @click="copyContentHandle(item.prompt)">
-                  <image
-                    :src="webUrl + '/aiChat/icon-02.png'"
-                    class="icon"
-                    mode="widthFix"
-                  />
-                  复制
-                </view>
-              </view>
             </view>
             <view v-if="item.type === -2" class="chat-message-body">
               <view class="avatar">
@@ -286,91 +166,18 @@
                       />
                       重新生成
                     </view>
-                    <view
-                      :class="{
-                        'playing': [item.conversationId, item.messageId, item.parentMessageId].includes(audioPlayId) && isPlayAudio
-                      }"
-                      class="item"
-                      @click="ttsHandle(item)"
-                    >
-                      <image
-                        :src="webUrl + '/aiChat/' + (([item.conversationId, item.messageId, item.parentMessageId].includes(audioPlayId) && isPlayAudio) ? 'audio-on' : 'audio-off') +'.png'"
-                        class="icon"
-                        mode="widthFix"
-                      />
-                      语音播放
-                    </view>
                     <view class="item item2" @click="copyMoreInfoHandle(item)">拷贝</view>
                   </view>
                 </view>
               </view>
               <!-- 换一换 -->
               <view
-                v-if="!item.showCursor &&
+                v-if="item.showMoreInfo.show"
-                  !item.isError &&
-                  (item.orderList.length > 0 ||
-                    item.giftGoodsList.length > 0 ||
-                    item.goodsList.length > 0 ||
-                    item.shopList.length > 0 || 
-                    item.prizeList.length > 0 ||
-                    item.ichList.length > 0 ||
-                    item.qianxianList.length > 0
-                  )
-                "
                 class="change-list-wrap"
               >
-                <!-- 礼品 -->
+                <view v-if="item.showMoreInfo.showType === '特产商品'" class="list-wrap">
-                <view
-                  v-if="item.giftGoodsList.length > 0"
-                  class="recommend-goods-wrap"
-                >
-                  <swiper
-                    class="goods-swiper"
-                    :indicator-dots="false"
-                    :autoplay="false"
-                    :current="item.currentSwiperIndex"
-                    previous-margin="120rpx"
-                    next-margin="120rpx"
-                    circular
-                    @change="e => onSwiperChange(index, e)"
-                  >
-                    <swiper-item
-                      v-for="(goodItem, goodIndex) in item.giftGoodsList"
-                      :key="goodIndex"
-                    >
-                      <view
-                        :class="{ 'active': item.currentSwiperIndex === goodIndex }"
-                        class="goods-item"
-                        @click="productItemClickHandle(goodItem)"
-                      >
-                        <view class="supplier" @click.stop="productItemSupplierClickHandle(goodItem)">
-                          <image
-                            :src="webUrl + '/aiChat/icon-57.png'"
-                            class="icon"
-                            mode="widthFix"
-                            lazy-load
-                          />
-                          <text class="s-name">{{ goodItem.merName ||goodItem.storeName }}</text>
-                          <u-icon name="arrow-right" color="#999" size="12"></u-icon>
-                        </view>
-                        <view class="title one-t">{{ goodItem.name }}</view>
-                        <image :src="goodItem.img" class="p-img" mode="aspectFill" lazy-load />
-                        <view class="price">
-                          <text class="unit">￥</text>
-                          <text class="num">{{ goodItem.price }}</text>
-                        </view>
-                        <view class="actions">
-                          <view class="btn-buy" @click.stop="productItemBuyNowClickHandle(goodItem)">立即下单</view>
-                          <view class="btn-gift" @click.stop="productItemGiftBuyClickHandle(goodItem)">送给朋友</view>
-                        </view>
-                      </view>
-                    </swiper-item>
-                  </swiper>
-                </view>
-                <!-- 特产商品 -->
-                <view v-if="item.goodsList.length > 0" class="list-wrap">
                   <view
-                    v-for="(productItem, productIndex) in item.goodsList"
+                    v-for="(productItem, productIndex) in item.showMoreInfo.resultItems"
                     :key="productIndex"
                     class="product-item"
                     @click="productItemClickHandle(productItem)"
@@ -378,7 +185,6 @@
                     <image
                       :src="productItem.img"
                       class="img"
-                      lazy-load
                     />
                     <view class="product-info">
                       <view class="name one-t">
@@ -393,21 +199,19 @@
                     </view>
                   </view>
                 </view>
-                <!-- 店铺 -->
+                <view v-if="item.showMoreInfo.showType === '店铺'" class="list-wrap">
-                <view v-if="item.shopList.length > 0" class="list-wrap">
                   <view
-                    v-for="(hotel, hotelIndex) in item.shopList"
+                    v-for="(hotel, hotelIndex) in item.showMoreInfo.resultItems"
                     :key="hotelIndex"
                     class="product-item"
                     @click="hotelItemClickHandle(hotel)"
                   >
                     <view class="hotel-type">
-                      {{ hotel.hotelTypeName }}
+                      手工体验
                     </view>
                     <image
-                      :src="hotel.img + ((hotel.img && hotel.img.indexOf('.mp4') > -1) ? '?vframe/jpg/offset/1' : '')"
+                      :src="hotel.img"
                       class="img"
-                      lazy-load
                     />
                     <view class="product-info">
                       <view class="name one-t">
@@ -419,10 +223,9 @@
                     </view>
                   </view>
                 </view>
-                <!-- 非遗 -->
+                <view v-if="item.showMoreInfo.showType === '非遗文化'" class="list-wrap">
-                <view v-if="item.ichList.length > 0" class="list-wrap">
                   <view
-                    v-for="(ich, ichIndex) in item.ichList"
+                    v-for="(ich, ichIndex) in item.showMoreInfo.resultItems"
                     :key="ichIndex"
                     class="product-item"
                     @click="ichItemClickHandle(ich)"
@@ -430,7 +233,6 @@
                     <image
                       :src="ich.img"
                       class="img"
-                      lazy-load
                     />
                     <view class="product-info">
                       <view class="name one-t">
@@ -442,10 +244,9 @@
                     </view>
                   </view>
                 </view>
-                <!-- 千县 -->
+                <view v-if="item.showMoreInfo.showType === '千县名品'" class="list-wrap">
-                <view v-if="item.qianxianList.length > 0" class="list-wrap">
                   <view
-                    v-for="(qianxian, qianxianIndex) in item.qianxianList"
+                    v-for="(qianxian, qianxianIndex) in item.showMoreInfo.resultItems"
                     :key="qianxianIndex"
                     class="product-item"
                     @click="qianxianItemClickHandle(qianxian)"
@@ -453,7 +254,6 @@
                     <image
                       :src="qianxian.img"
                       class="img"
-                      lazy-load
                     />
                     <view class="product-info">
                       <view class="name name2 one-t">
@@ -462,59 +262,15 @@
                     </view>
                   </view>
                 </view>
-                <!-- 抽奖 -->
+                <view class="change-btn">
-                <view v-if="item.prizeList.length > 0" class="list-wrap prize-list-wrap">
+                  <image
-                  <view
+                    :src="webUrl + '/aiChat/icon-change.png'"
-                    v-for="(prize, prizeIndex) in item.prizeList"
+                    class="icon"
-                    :key="prizeIndex"
+                    mode="widthFix"
-                    class="prize-item"
+                    @click="analyzeKeywordsChangeHandle(item.conversationId, item.showMoreInfo)"
-                    @click="prizeItemClickHandle(prize)"
+                  />
-                  >
-                    <image
-                      :src="prize.img"
-                      class="img"
-                      mode="widthFix"
-                      lazy-load
-                    />
-                  </view>
-                </view>
-                <!-- 订单 -->
-                <view v-if="item.orderList.length > 0" class="order-list-wrap">
-                  <view
-                    v-for="(order, orderIndex) in item.orderList"
-                    :key="orderIndex"
-                    class="order-item-wrap"
-                  >
-                    <order-item
-                      :item="order"
-                      @viewOrderTrack="viewOrderTrackHandle"
-                    />
-                  </view>
-                </view>
-                <view
-                  v-if="item.shopList.length > 0 ||
-                    item.goodsList.length > 0 ||
-                    item.giftGoodsList.length > 0 ||
-                    item.ichList.length > 0 ||
-                    item.qianxianList.length > 0 ||
-                    item.shopList.length > 0
-                  "
-                  class="change-btn"
-                >
-                  <view class="change-btn-content" @click="analyzeKeywordsChangeHandle(item.conversationId, item)">
-                    <image
-                      :src="webUrl + '/aiChat/icon-53.png'"
-                      :class="{
-                        'rotate': item.changeIsRotate
-                      }"
-                      class="icon"
-                      mode="widthFix"
-                    />
-                    换一换
-                  </view>
                 </view>
               </view>
-              <!-- 建议提问 -->
               <view
                 v-if="index === (chatMessageListLength - 1) && item.listQuestion.length > 0"
                 class="suggestion-wrap"
@@ -542,11 +298,7 @@
             </view>
           </view>
         </view>
-        <view
+        <view id="bottom_postion" class="bottom-postion" />
-          v-if="chatNumber"
-          id="bottom_postion"
-          class="bottom-postion"
-        />
       </view>
     </view>
     <view
@@ -555,57 +307,30 @@
       }"
       class="page-to-bottom"
     >
-      <view class="down-icon-wrap">
-        <image
-          v-if="chatMessageListLength > 0 && !isScrollToBottom && !loading"
-          :src="webUrl + '/aiChat/down.png'"
-          class="icon down-icon"
-          mode="widthFix"
-          @click="scrollToBottomHandle"
-        />
-      </view>
       <view
-        :class="{
+        v-if="chatNumber"
-          'container-county': !!countyId
+        class="new-chat"
-        }"
+        @click="createNewHandle"
-        class="container"
       >
-        <view
+        <image
-          v-if="chatNumber || showGiftSteps"
+          :src="webUrl + '/aiChat/icon-05.png'"
-          class="new-chat"
+          class="btn-icon"
-          @click="createNewHandle"
+          mode="widthFix"
-        >
+        />
-          <image
+        开启新对话
-            :src="webUrl + '/aiChat/icon-54.png'"
-            class="btn-icon"
-            mode="widthFix"
-          />
-          开启新对话
-        </view>
-        <view
-          v-if="!countyId"
-          v-for="(item, index) in bottomTools"
-          :key="index"
-          :class="{
-            'hide': !item.display
-          }"
-          class="bottom-tool-item"
-          @click="bottomToolClickHandle(item)"
-        >
-          <image
-            :src="item.icon"
-            class="tool-icon"
-            mode="widthFix"
-          />
-          {{ item.name }}
-        </view>
       </view>
+      <image
+        v-if="chatMessageListLength > 0 && !isScrollToBottom && !loading"
+        :src="webUrl + '/aiChat/down.png'"
+        class="icon"
+        mode="widthFix"
+        @click="scrollToBottomHandle"
+      />
     </view>
     <bottom-send
       ref="bottomSend"
       :loading="loading"
       :keyboard-height="keyboardHeight"
-      :voice-exception="exceptionConfig.voice_exception"
       @send="streamReq"
       @add="createNewHandle"
       @history="historyViewHandle"
@@ -614,170 +339,77 @@
     <AiHistoryList
       ref="historyView"
       :status-bar-height="statusBarHeight"
-      :county-id="countyId"
-      @enter-history="audioStopHandle"
-    />
-    <ProductWindow
-      ref="attrWindow"
-      :attr="attr"
-      :cart-num="cart_num"
-      :show-ok="!showGiftBtn"
-      :is-gift="showGiftBtn"
-      :padding-bottom="'60px'"
-      class-name="ai-product-window"
-      ok-text="立即购买"
-      @changeFun="changeFun"
-      @ok="buyNowOrGiftBuyReq(1)"
-      @gift="buyNowOrGiftBuyReq(2)"
     />
   </view>
 </template>
 
 <script>
-import { chatMixinsV2 } from '../mixins/chatMixinsV2.js'
+import { chatMixins } from '../mixins/chatMixins.js'
-import goCartMixin from '@/mixins/goCartMixins'
 import {
   getAiSystemInfoSetting,
   getAiSystemInfoTopic
 } from '@/api/public'
-import {
-  getCountyAiDetail
-} from '@/api/chat/index'
 import AiHistoryList from '../components/historyList'
 import BottomSend from '../components/bottomSend.vue'
-import OrderItem from '../components/orderItem.vue'
-import ProductWindow from '@/components/ProductWindow'
 export default {
   name: 'AiChatIndexPage',
   components: {
     AiHistoryList,
-    BottomSend,
+    BottomSend
-    OrderItem,
-    ProductWindow
   },
-  mixins: [chatMixinsV2, goCartMixin],
+  mixins: [chatMixins],
   data() {
     return {
-      cityName: '',
-      countyId: '',
       animationWidth: '150%',
       animationStr: '',
       settingInfo: {},
-      topicList: [],
+      topicList: []
-      topicIsRotate: false,
-      showGiftSteps: false,
-      currentGiftStepIndex: 0,
-      giftSelections: {},
-      giftBudget: '',
-      giftBuyOptions: [],
-      countyTools: []
     }
   },
-  onLoad(options) {
-    this.cityName = options.cityName || ''
-    this.countyId = options.countyId || ''
-  },
   onShow() {
-    // 1-新对话，2-我要送礼
+    const addNewChat = uni.getStorageSync('addNewChat') === '1'
-    const addNewChat = uni.getStorageSync('addNewChat') || ''
     // 从历史界面点击新增对话
-    if (addNewChat) {
+    if (addNewChat && this.chatNumber) {
-      if (addNewChat === '1' && (this.chatNumber || this.showGiftSteps)) {
+      console.log(addNewChat)
-        this.createNewHandle()
-      }
-      if (addNewChat === '2') {
-        const giftOptionItem = this.bottomTools.find((i) => i.giftCardEnabled === 1)
-        if (giftOptionItem) {
-          this.bottomToolClickHandle(giftOptionItem)
-        }
-      }
       uni.removeStorageSync('addNewChat')
+      this.createNewHandle()
     }
-    this.audioStopHandle()
+  },
+  onUnload() {
+    this.closeWsFn()
   },
   methods: {
-    extraReqFn() {
+    createdCallbak() {
       this.$nextTick(() => {
         this.scrollToBottomHandle()
-        if (this.countyId) {
+        getAiSystemInfoSetting().then(res => {
-          getCountyAiDetail({
+          const { success, data } = res
-            countyId: this.countyId
+          if (success) {
-          }).then(res => {
+            this.settingInfo = data
-            const { success, data } = res
+            this.animationWidth = `${data.systemTopicDivMaxWidth * 750}rpx`
-            if (success) {
+            this.animationStr = `TranslateXSwiper-${data.systemTopicDivMaxWidth * 10} ${data.systemTopicDivScrollDuration}s infinite linear alternate`
-              this.settingInfo.helloMessageTitle = data.title || ''
-              this.settingInfo.helloMessageContent = data.introduction || ''
-              this.countyTools = data.modules || []
-            }
-          })
-        } else {
-          getAiSystemInfoSetting().then(res => {
-            const { success, data } = res
-            if (success) {
-              this.settingInfo = data
-              this.animationWidth = `${data.systemTopicDivMaxWidth * 750}rpx`
-              this.animationStr = `TranslateXSwiper-${data.systemTopicDivMaxWidth * 10} ${data.systemTopicDivScrollDuration}s infinite linear alternate`
-            }
-          })
-          this.loadData()
-        }
-      })
-    },
-    loadData(type = '') {
-      if (this.topicIsRotate) return
-      if (type === 'click') {
-        this.topicIsRotate = true
-      }
-      getAiSystemInfoTopic().then(res => {
-        const { success, data } = res
-        if (success) {
-          // 返回数据先过滤this.topicList，随机保留三条数据
-          let list = data || []
-          if (this.topicList && this.topicList.length > 0) {
-            const currentTitles = this.topicList.map(item => item.title)
-            const filtered = list.filter(item => !currentTitles.includes(item.title))
-            // 如果过滤后的数据不够3条，就不进行过滤
-            if (filtered.length >= 3) {
-              list = filtered
-            }
           }
-          list.sort(() => Math.random() - 0.5)
+        })
-          this.topicList = list.slice(0, 3)
+        getAiSystemInfoTopic().then(res => {
-          setTimeout(() => {
+          const { success, data } = res
-            this.topicIsRotate = false
+          if (success) {
-          }, 1000)
+            this.topicList = data || []
-        }
+          }
+        })
       })
     },
     // 创建新会话
-    createNewHandle(type = '') {
+    createNewHandle() {
-      this.closeAttrWindow()
+      if (!this.chatNumber) return
-      if (this.audioContext) {
-        this.audioContext.stop()
-      }
-      wx.getBackgroundAudioManager().stop()
       this.closeWsFn()
       this.chatNumber = ''
       this.showCursor = false
       this.loading = false
       this.getConfigLoading = false
       this.chatMessageList = []
-      this.loadData()
-      // 清空所有送礼选项
-      this.giftSelections = {}
-      this.giftBudget = ''
-      this.currentGiftStepIndex = 0
-      if (type !== 'giftChat') {
-        const idx = this.bottomTools.findIndex((i) => i.giftCardEnabled === 1)
-        this.$set(this, 'showGiftSteps', false)
-        if (idx > -1) {
-          this.$set(this.bottomTools[idx], 'display', true)
-        }
-      }
     },
-    /*
     clickBackHandle() {
-      if (!this.chatNumber && !this.showGiftSteps) {
+      if (!this.chatNumber) {
         if (getCurrentPages().length > 1) {
           uni.navigateBack()
         } else {
@@ -789,9 +421,8 @@ export default {
         this.createNewHandle()
       }
     },
-    */
     pageContainerBeforeleave() {
-      if (!this.chatNumber && !this.showGiftSteps) {
+      if (!this.chatNumber) {
         if (getCurrentPages().length > 1) {
           uni.navigateBack()
         } else {
@@ -802,19 +433,6 @@ export default {
       } else {
         this.createNewHandle()
       }
-    },
-    countyToolItemClickHandle(item) {
-      if (item.moduleType === 'prompt') {
-        this.streamReq({
-          prompt: item.promptContent,
-          init: 0
-        })
-      }
-      if (item.moduleType === 'url') {
-        uni.navigateTo({
-          url: item.url
-        })
-      }
     }
   }
 }
@@ -853,45 +471,43 @@ export default {
 		opacity: 0.0;
 	}
 }
-.home-wrap {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: calc(100vh - 240rpx);
-  padding: 0 0 240rpx 0;
-  box-sizing: border-box;
-  overflow-y: auto;
-}
 .focus-guide-wrap {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  flex-direction: column;
+  padding: 60rpx 40rpx;
   .guide-left {
     .avatar {
       display: block;
-      width: 400rpx;
+      width: 267rpx;
-    }
+      height: 530rpx;
-    .county-avatar {
-      width: 360rpx;
-    }
-    .avatar-bounce {
-      animation: bounce 2s infinite ease-in-out;
     }
   }
   .guide-right {
     position: relative;
-    width: 100%;
+    padding: 30rpx;
-    padding: 30rpx 0;
+    margin: 0 0 0 40rpx;
+    border-radius: 20rpx;
     font-size: 28rpx;
-    text-align: center;
+    background-color: #fff;
+    box-shadow: 0rpx 12rpx 30rpx rgba(0,0,0,0.1);
+    .trangle {
+      position: absolute;
+      bottom: 120rpx;
+      left: -15rpx;
+      width: 30rpx;
+      height: 30rpx;
+      background-color: #fff;
+      box-shadow: -30rpx 12rpx 30rpx rgba(0,0,0,0.1);
+      transform: rotate(45deg);
+    }
     .title {
+      width: 110%;
       font-weight: bold;
-      font-size: 34rpx;
     }
     .content {
-      padding: 30rpx 24rpx 0 24rpx;
+      padding: 30rpx 0 0 0;
-      color: #3D4CF0;
+      color: #999;
     }
   }
 }
@@ -900,48 +516,46 @@ export default {
   .title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: center;
-    padding: 0 24rpx;
+    .txt {
-    color: #3D4CF0;
+      width: 186rpx;
-    font-size: 28rpx;
+      height: 46rpx;
-    .title-left {
+      margin: 0 20rpx;
-      font-size: 32rpx;
+      border-radius: 24rpx;
-      font-weight: bold;
+      text-align: center;
-    }
+      line-height: 46rpx;
-    .title-right {
+      color: #fff;
-      display: flex;
+      font-size: 28rpx;
-      align-items: center;
+      background-color: #3D4CF1;
     }
     .icon {
       display: flex;
-      width: 32rpx;
+      width: 40rpx;
       height: 32rpx;
-      margin: 0 8rpx 0 0;
-      &.rotate {
-        animation: spin-icon 1s linear;
-      }
     }
   }
   .list-wrap {
     width: 100%;
-    padding: 40rpx 0 0 0;
+    margin: 60rpx 0 0 0;
     overflow-x: hidden;
     .list-cont {
-      padding: 0 24rpx;
-      box-sizing: border-box;
       display: flex;
-      flex-direction: column;
+      flex-wrap: wrap;
-      align-items: flex-start;
+      width: 750 * 1.5rpx;
+      padding: 0 0 0 24rpx;
+      box-sizing: border-box;
+      // animation: translateXSwiper 10s infinite linear alternate;
       .list-item {
         display: flex;
         align-items: center;
-        padding: 6rpx 12rpx;
+        height: 48rpx;
-        margin: 0 0 24rpx 0;
+        padding: 0 18rpx;
-        border-radius: 12rpx;
+        margin: 0 30rpx 30rpx 0;
-        border: 1rpx solid #ddd;
+        border-radius: 24rpx;
         font-size: 28rpx;
         color: #666;
-        background-color: #fff;
+        background: rgba(255,255,255,0.39);
+        box-shadow: 0rpx 6rpx 12rpx rgba(0,0,0,0.1);
         .icon {
           display: block;
           width: 24rpx;
@@ -960,58 +574,4 @@ export default {
     transform: translateX(-50%);
   }
 }
-
-@keyframes bounce {
-  0%, 100% {
-    transform: translateY(0);
-  }
-  50% {
-    transform: translateY(-20rpx);
-  }
-}
-
-.county-home-wrap {
-  justify-content: flex-start;
-  .guide-right {
-    .content {
-      padding: 30rpx 32rpx 0 32rpx;
-      color: #666;
-      text-align: left;
-    }
-  }
-}
-.county-tools-wrap {
-  width: 100%;
-  padding: 40rpx 0 0 0;
-  .list-cont {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    width: 100%;
-    padding: 0 60rpx;
-    box-sizing: border-box;
-    .list-item {
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      width: 28%;
-      padding: 20rpx 0 12rpx 0;
-      margin: 0 0 24rpx 0;
-      border-radius: 12rpx;
-      background-color: #fff;
-      box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.1);
-      .icon {
-        display: block;
-        width: 60rpx;
-        height: 60rpx;
-        margin: 0 8rpx 0 0;
-      }
-      .name {
-        padding: 8rpx 0 0 0;
-        font-size: 28rpx;
-        color: #333;
-      }
-    }
-  }
-}
 </style>

api/chat/index.js

@@ -37,59 +37,3 @@ export function historyChatMessage(params) {
 export function deleteChatListByType(type) {
   return request.delete('/v1/chat/type/' + type, {}, { login: true })
 }
-
-export function deleteCountyChatListByType(type, params) {
-  return request.delete('/county-ai/chat/type/' + type + params, {}, { login: true })
-}
-
-export function getWeatherData(params) {
-  return request.get('/v1/chat/weatherData', params, { login: true })
-}
-
-export function getHolidayData(params) {
-  return request.get('/v1/chat/holidayData', params, { login: true })
-}
-
-export function getCompletionsV3(params) {
-  return request.get('/v1/chat/intent/recognize', params, { login: true })
-}
-
-// 通过关键字-搜索列表-换一换
-export function getAnalyzeKeywordsChangeV3(data) {
-  return request.post('/v1/chat/skill/refresh', data, { login: true })
-}
-
-// 以图搜索商品
-export function getAnalyzeByImageV3(data) {
-  return request.post('/v1/chat/image/recognition', data, { login: true })
-}
-
-// 获取送礼选项配置
-export function getGiftRecommendOptions(params) {
-  return request.get('/ai/gift-recommend/options', params, { login: true })
-}
-
-// 获取县域AI详情
-export function getCountyAiDetail(params) {
-  return request.get('/county-ai/detail', params, { login: true })
-}
-
-export function getSseCountyAiConfigV1(data) {
-  return request.post('/county-ai/chat', data, { login: true })
-}
-
-export function getCountyAiCompletionsV1(params) {
-  return request.get('/county-ai/chat/recognize', params, { login: true })
-}
-
-export function getCountyAiChatList(params) {
-  return request.get('/county-ai/chat/list', params, { login: true })
-}
-
-export function getCountyAiHistoryChatMessage(params) {
-  return request.get('/county-ai/chat/message', params, { login: true })
-}
-
-export function getGiftRecommendPrompt(data) {
-  return request.post('/ai/gift-recommend/build-prompt', data, { login: true })
-}

api/gift.js

@@ -63,64 +63,4 @@ export function getGiftCardResend(data) {
  */
 export function getGiftCardSendBackground(data) {
   return request.get("giftCard/giftCardBackgroundImage", data); 
-}
+}
-
-/**
- * 创建团购礼品
- * @param {*} data
- */
-export function createGroupBuyGift(data) {
-  return request.post("/travel/giftCardOrder/confirm", data); 
-}
-/**
- * 旅居团购礼品卡订单创建
- * @param {*} data
- */
-export function createSojoumGroupBuyGift(key, data) {
-  return request.post("/travel/giftCardOrder/create/" + key, data); 
-}
-
-/**
- * 旅居团购礼品卡订单详情
- * @param {*} params
- * @returns
- */
-export function fetchSojoumGroupBuyGiftDetail(params) {
-  return request.get("/travel/giftCard/info",params, {
-    login: true
-  })
-}
-
-/**
- * 领取旅居团购礼品卡
- * @param {*} params
- * @returns
- */
-export function receiveSojoumGroupBuyGift(params) {
-  return request.post("/travel/giftCard/receive", params, {
-    login: true
-  })
-}
-
-/**
- * 旅居礼品卡送礼入口轮播图
- * @param {*} params
- * @returns
- */
-export function fetchSojoumGroupBuyGiftCarousel(params) {
-  return request.get("/travel/giftCardTravelBanner",params, {
-    login: true
-  })
-}
-
-/**
- * 计算旅居团购礼品订单价格
- * @param {*} params
- * @returns
- */
-
-export function computedSojoumGroupBuyGiftOrderPrice(params) {
-  return request.post("/travel/giftCardOrder/computed/" + params.key, params, {
-    login: true
-  })
-}

api/health.js

@@ -78,12 +78,4 @@ export function getRecipe(params) {
  */
 export function getBanner() {
   return request.get("/wellness/exhibition/banner")
-}
+}
-
-/**
- * 康养生活-康养旅居顶部配置
- * @returns 
- */
-export function getWellnessTopImage() {
-  return request.get("/wellness/topImage")
-}

api/inn.js

@@ -191,10 +191,6 @@ export function getHotelTypeList() {
     });
 }
 
-export function getHotelBanner(params) {
-    return request.get("/hotelBanner", params);
-}
-
 /**
  * 店铺详情海报
  * @param id 店铺ID int
@@ -277,17 +273,4 @@ export function getMerchantApply() {
     return request.get("/merchantApply/userHotels", {}, {login: true}) 
 }
 
-/**
- * 获取用户评论列表
- */
-export function getCommentList(params) {
-    return request.get("/user/reply/list", params, {login: true})
-}
-
-/**
- * 添加用户评论
- */
-export function addComment(data) {
-    return request.post("/user/reply/add", data, {login: true})
-}
 

api/join.js

@@ -11,8 +11,10 @@ export function getImages() {
 }
 
 // 商户申请页面数据
-export function getShopData(params) {
+export function getShopData(partnerId) {
-    return request.get("/merchantApply/index", params, {login: true})
+    let param = {};
+    if (partnerId) param.partnerId = partnerId;
+    return request.get("/merchantApply/index", param, {login: true})
 }
 
 // 查看商户申请
@@ -27,38 +29,23 @@ export function getWholesaler() {
 }
 
 // 提交店铺入驻申请
-export function saveShop(hotelInfo, partnerId = '', promoterUid = '') {
+export function saveShop(hotelInfo, captcha, partnerId) {
     let param = {hotelInfo, captcha: hotelInfo.captcha};
-    if (partnerId && partnerId.length > 0) {
+    if (partnerId && partnerId.length > 0) param.partnerId = partnerId;
-        param.partnerId = partnerId;
-    }
-    if (promoterUid && promoterUid.length > 0) {
-        param.promoterUid = promoterUid;
-    }
     return request.post("/merchantApply/hotel/submit", param, {login: true})
 }
 
 // 提交特产供应商入驻申请
-export function saveSupplier(hotelInfo, supplierInfo, partnerId = '', promoterUid = '') {
+export function saveSupplier(hotelInfo, supplierInfo, partnerId) {
     let param = {hotelInfo, supplierInfo, captcha: supplierInfo.captcha};
-    if (partnerId && partnerId.length > 0) {
+    if (partnerId && partnerId.length > 0) param.partnerId = partnerId;
-        param.partnerId = partnerId;
-    }
-    if (promoterUid && promoterUid.length > 0) {
-        param.promoterUid = promoterUid;
-    }
     return request.post("/merchantApply/goodSupplier/submit", param, {login: true})
 }
 
 // 提交文玩供应商入驻申请
-export function saveWenwanSupplier(hotelInfo, supplierInfo, partnerId = '', promoterUid = '') {
+export function saveWenwanSupplier(hotelInfo, supplierInfo, partnerId) {
     let param = {hotelInfo, supplierInfo, captcha: supplierInfo.captcha};
-    if (partnerId && partnerId.length > 0) {
+    if (partnerId && partnerId.length > 0) param.partnerId = partnerId;
-        param.partnerId = partnerId;
-    }
-    if (promoterUid && promoterUid.length > 0) {
-        param.promoterUid = promoterUid;
-    }
     return request.post("/merchantApply/wenwanSupplier/submit", param, {login: true})
 }
 
@@ -68,61 +55,7 @@ export function saveWholesaler(wholesalerInfo) {
     return request.post("/merchantApply/wholesaler/submit", param, {login: true})
 }
 
-export function saveExperienceStore(params) {
-    return request.post("/merchantApply/experienceStore/submit", params, {login: true})
-}
-
-export function saveExperienceStoreDraft(params) {
-    return request.post("/merchantApply/experienceStore/saveDraft", params, {login: true})
-}
-
-export function getExperienceStoreCategoryList() {
-    return request.get("/experienceStore/categoryList", {}, {login: true})
-}
-
-export function getExperienceStoreInfo(params) {
-    return request.get("merchantApply/info/experienceStore", params, {login: true})
-}
-
 // 撤销入驻申请
 export function removeApply() {
     return request.post("/merchantApply/revoke")
 }
-
-// 特色店铺入驻信息
-export function getHotelInfo(params) {
-    return request.get("merchantApply/info/hotel", params, {login: true})
-}
-
-// 获取千县名品店铺类型列表
-export function getCountyFamousHotelType(params) {
-    return request.get("/countyFamous/hotelType", params, {login: true})
-}
-
-/**
- * 旅居管家入驻申请详情
- */
-export function getTravelInfo(params) {
-    return request.get("merchantApply/info/travel", params, {login: true})
-}
-
-/**
- * 提交旅居管家入驻申请
- */
-export function saveTravel(params) {
-    return request.post("/merchantApply/travel/submit", params, {login: true})
-}
-
-/**
- *  旅居管家申请草稿保存
- */
-export function saveTravelDraft(params) {
-    return request.post("/merchantApply/travel/saveDraft", params, {login: true})
-}
-
-/**
- * 旅居管家撤销申请
- */
-export function revokeTravel(params) {
-    return request.post("/merchantApply/travel/revoke", params, {login: true})
-}

api/lottery.js

@@ -3,77 +3,15 @@ import request from '@/utils/request'
 /**
  * 抽奖活动信息
  * */
-export function getDetail(params = {}) {
+export function getDetail() {
-    return request.get('/lottery/dice/detail', params)
+    return request.get('/lottery/dice/detail')
 }
 
 /**
  * 抽奖
  * */
-export function getPrize(data = {}) {
+export function getPrize() {
-    return request.post('/lottery/dice/draw', data)
+    return request.post('/lottery/dice/draw')
-}
-
-/**
- * 县域抽奖活动详情
- * @param activityId 抽奖活动ID
- */
-export function getDrawActivityInfo(activityId) {
-    return request.get('/draw/activityInfo', { activityId })
-}
-
-/**
- * 县域抽奖活动规则
- */
-export function getDrawRuleConfig() {
-    return request.get('/draw/ruleConfig')
-}
-
-/**
- * 我的抽奖码列表
- * @param status 抽奖码状态（0:等待开奖, 1:已中奖, 2:未中奖, -1:已失效）
- */
-export function getDrawMyTickets(status) {
-    const params = {}
-    if (status !== undefined && status !== null && status !== '') {
-        params.status = status
-    }
-    return request.get('/draw/myTickets', params)
-}
-
-/**
- * 抽奖活动中奖记录
- * @param activityId 抽奖活动ID
- */
-export function getActivityWinRecord(activityId) {
-    return request.get('/draw/activityWinRecord', { activityId })
-}
-
-/**
- * 获取最新中奖名单
- * @param activityId 抽奖活动ID（可选）
- */
-export function getDrawLatestWinners(activityId) {
-    const params = {}
-    if (activityId !== undefined && activityId !== null && activityId !== '') {
-        params.activityId = activityId
-    }
-    return request.get('/draw/latestWinners', params)
-}
-
-/**
- * 历史抽奖活动列表
- * 用于在中奖名单页面切换历史抽奖活动
- */
-export function getDrawHistoryActivities() {
-    return request.get('/draw/historyActivities')
-}
-
-/**
- * 获取抽奖相关显示配置
- */
-export function getDrawConfig() {
-    return request.get('/draw/config')
 }
 
 /**
@@ -97,52 +35,4 @@ export function getLogs(page = 1, limit = 10) {
  * */
 export function getLotteryShareInfo() {
     return request.get('/lottery/shareImage')
-}
+}
-
-/**
- * 订单支付完成后检查抽奖码
- * @param orderId 订单号
- */
-export function getDrawTicketByOrder(orderId) {
-    return request.get('/draw/ticketCheck', { orderId })
-}
-
-/**
- * 校验抽奖活动是否到开奖时间
- * @param activityId 抽奖活动ID
- */
-export function checkDrawTime(activityId) {
-    return request.get('/draw/checkTime', { activityId })
-}
-
-/**
- * 领取优惠券奖品
- * @param ticketId 抽奖券ID
- */
-export function claimCoupon(ticketId) {
-    return request.post('/draw/claimCoupon', { ticketId })
-}
-
-/**
- * 领取实物奖品
- * @param ticketId 抽奖券ID
- * @param addressId 用户收货地址ID
- */
-export function claimPrize(ticketId, addressId) {
-    return request.post('/draw/claimPrize', { ticketId, addressId })
-}
-
-/**
- * 获取实名认证信息
- */
-export function getDrawRealname() {
-    return request.get('/draw/realname')
-}
-
-/**
- * 提交实名认证
- * @param data { realName, idCard, phone }
- */
-export function submitDrawRealname(data = {}) {
-    return request.post('/draw/realname', data)
-}

api/order.js

@@ -3,14 +3,6 @@
  * */
 import request from "@/utils/request";
 
-/**
- * 获取默认地址
- * @returns {*}
- */
-export function getAddressDefaultSelected() {
-    return request.get("/address/defaultSelected")
-}
-
 /**
  * 通过购物车 id 获取订单信息
  * @param cartId
@@ -102,17 +94,6 @@ export function postOrderRefund(data) {
     return request.post("/order/refund/verify", data);
 }
 
-/**
- * 取消退款申请
- * @param uni
- * @returns {*}
- */
-export function cancelOrderRefund(uni) {
-    return request.post("/order/refund/cancel", {
-        uni
-    });
-}
-
 /**
  * 确认收货
  * @returns {*}
@@ -197,31 +178,4 @@ export function aginConfirm(params) {
  */
 export function editAddress(params) {
     return request.post('/order/editAddress', params)
-}
+}
-
-/**
- * 申请修改订单收货地址
- * @param {*} params
- * @returns
- */
-export function applyEditAddress(params) {
-    return request.post('/order/applyEditAddress', params)
-}
-
-/**
- * 订单预计到达时间
- * @param {*} params 
- * @returns 
- */
-export function orderExpectedArrivalTime(params) {
-    return request.post('/order/express/estimatedTime', params)
-}
-
-/**
- * 旅居团购订单详情
- * @param {*} params 
- * @returns 
- */
-export function groupOrderDetail(params) {
-    return request.post('/travel/travelGroupOrder/detail/' + params.key, params)
-}

api/product.js

@@ -159,32 +159,4 @@ export function hadView(data) {
 
 export function getShareImg(id) {
     return request.get('/landmarkGoods/poster/' + id, {}, {login: false})
-}
+}
-
-export function getLatestExperienceCoupon() {
-    return request.get('/experienceCoupon/latest', {}, {login: true})
-}
-
-export function getExperienceCouponList() {
-    return request.get('/experienceCoupon/list', {}, {login: true})
-}
-
-export function getExperienceCouponItems(params) {
-    return request.get('/experienceCoupon/items', params, {login: true})
-}
-
-export function getExperienceCouponCategoryList(params) {
-    return request.get('/experienceCoupon/categoryList', params, {login: true})
-}
-
-export function createExperienceCouponOrder(data) {
-    return request.post('/experienceCoupon/order/create', data, {login: true})
-}
-
-export function getExperienceCouponOrderDetail(orderId) {
-    return request.get(`/experienceCoupon/order/detail/${orderId}`, {}, {login: true})
-}
-
-export function checkExperienceCoupon(params) {
-    return request.get('/experienceCoupon/check', params, {login: true})
-}

api/public.js

@@ -222,18 +222,3 @@ export function getAiSystemInfoSetting() {
 export function getAiSystemInfoTopic() {
     return request.get('/ai/systemTopic', {}, { login: false })
 }
-
-// 获取异常提示配置
-export function getExceptionConfig() {
-  return request.get('/ai/exceptionConfig', {}, { login: true })
-}
-
-// 获取已启用的底部导航配置列表
-export function getBottomNavigationConfigList() {
-  return request.get('/ai/bottom-navigation/list', {}, { login: true })
-}
-
-// 获取通用分享配置
-export function getWeixinShareConfig() {
-    return request.get('/weixinShareConfig', {}, { login: false })
-}

api/qianxian.js

@@ -105,12 +105,12 @@ export function getSaleList(params) {
 }
 
 // 旅居列表
-// export function getJiaLouList(params) {
+export function getJiaLouList(params) {
-//     return request.get('/countyFamous/sojourn', params, {login: true})
+    return request.get('/countyFamous/sojourn', params, {login: true})
-// }
+}
 
 // 旅居详情
-export function getJiaLouDetail1(id) {
+export function getJiaLouDetail(id) {
     return request.get('/countyFamous/sojourn/' + id, {}, {login: true})  
 }
 
@@ -141,195 +141,15 @@ export function postJiaLouZan(data) {
 
 // 旅居资讯查看
 export function postJiaLouNewsView(data) {
-    return request.post('/travel/news/view', data, {login: true})  
+    return request.post('/countyFamous/news/view', data, {login: true})  
 }
 
 // 旅居资讯点赞
 export function postJiaLouNewsZan(data) {
-    return request.post('/travel/news/zan', data, {login: true})
+    return request.post('/countyFamous/news/zan', data, {login: true})
 }
 
 // 分享旅居
 export function postJiaLouShare(id) {
     return request.get('/countyFamous/sojourn/poster/' + id, {login: true})
-}
+}
-// 分享旅居1
-export function postTravelShare(id) {
-    return request.get('/travel/poster/' + id, {login: true})
-}
-/**
- * 获取旅居列表
- * countyId int 县城ID
-    shopType string 所属板块（countyFamous-千县；wellness-康养）
-    wellnessPlaceCateId int 康养圣地分类ID
-    name string 名称
-    page int 页码
-    limit int 每页数量
- */
-export function getJiaLouList(params) {
-    return request.get('/travel/merchantList', params, {login: true})
-}
-
-/**
- * 获取旅居详情
- * @param {*} id 
- */
-export function getJiaLouDetail(id) {
-    return request.get('/travel/merchant/' + id, {}, {login: true})  
-}
-
-/**
- * 旅居团购产品列表
-merId int 商户ID
-page int 页码
-limit int 每页数量
- */
-export function getJiaLouProductList(params) {
-    return request.get('/travel/products', params, {login: true})  
-}
-
-/**
- * 旅居团购产品详情
- * @param {*} id 产品ID
- */
-export function getJiaLouProductDetail(id) {
-    return request.get('/travel/product/' + id, {}, {login: true})  
-}
-
-/**
- * 旅居团购产品评论列表
- * travelGroupProductId int 旅居团购产品ID
- * type int 0-全部 1-好评 2-中评 3-差评
- * page int 页码
- * limit int 每页数量
- */
-export function getJiaLouProductReply(params) {
-    return request.get('/travel/product/reply', params, {login: true})
-}
-
-/**
- * 获取旅居团购产品评论统计
- * travelGroupProductId int 旅居团购产品ID
- */
-export function getJiaLouProductReplyCount(params) {
-    return request.get('/travel/product/reply/count', params, {login: true})
-}
-
-export function getTravelGroupOrderAgreement() {
-    return request.get('/travel/travelGroupOrderAgreement', {}, {login: true})
-}
-
-/**
- * 管家列表
- * merId int 商户ID
-page int 页码
-limit int 每页数量
- */
-export function getJiaLouStewardList(params) {
-    return request.get('/travel/steward', params, {login: true})  
-}
-
-/**
- * 指定月份可预约日期
- * @param {*} params 
- * travelGroupProductId int 旅居团购产品ID
-month string 月份（yyyy-MM）
- */
-export function getJiaLouCalendar(params) {
-    return request.get('/travel/product/calendar', params, {login: true})  
-}
-
-/**
- * 获取预定必读
- */
-export function getJiaLouBookingRules() {
-    return request.get('/travel/orderRule', {}, {login: true})  
-}
-
-/**
- * 创建订单
- * @param {*} params 
- * travelGroupProductId int 旅居团购产品ID
-orderStartDate string 订单开始日期（yyyy-MM-dd）
-orderEndDate string 订单结束日期（yyyy-MM-dd）
- */
-export function createJiaLouOrder(params) {
-    return request.post('/travel/travelGroupOrder/confirm', params, {login: true})  
-}
-
-/**
- * 旅居团购订单创建
- * @param {*} params 
- */
-export function createJiaLouOrderPay(params) {
-    return request.post('/travel/travelGroupOrder/create/' + params.key, params, {login: true})  
-}
-
-
-/**
- * 旅居资讯列表
- * merId int 旅居管家商户ID
-page int 页码
-limit int 每页条数
- */
-export function getJiaLouNewsList(params) {
-    return request.get('/travel/news', params, {login: true})
-}
-
-
-/**
- * 分享管家
- */
-export function getShareHousekeeper(id) {
-    return request.get('/travel/steward/poster/' + id, {login: true})
-}
-
-/**
- * 管家详情
- */
-export function getJiaLouStewardDetail(id) {
-    return request.get('/travel/steward/' + id, {}, {login: true})  
-}
-
-/**
- * 获取县城资讯详情
- */
-export function getCityNewsDetail(id) {
-    return request.get('/countyFamous/news/' + id, {}, {login: true})  
-}
-
-
-/**
- * 获取县城资讯类别
- */
-export function getCityNewsCategory() {
-    return request.get('/countyFamous/newsCategory', {}, {login: true})  
-}
-
-/**
- * 获取县城店铺列表
- */
-export function getCityShopList(params) {
-    return request.get('/countyFamous/hotel', params, {login: true})  
-}
-
-export function getCountyFamousHotelType(params) {
-    return request.get('/countyFamous/hotelType', params, {login: true})
-}
-
-/**
- * ������б�
- * travelMerchantId int �þ��̻�ID
- * experienceStoreCategoryId int ��������ID
- */
-export function getExperienceStoreList(params) {
-    return request.get('/experienceStore/list', params, { login: true })
-}
-
-export function getExperienceStoreProject(experienceMerchantId) {
-    return request.get('/experienceStoreProject/' + experienceMerchantId, {}, { login: true })
-}
-
-export function getExperienceStoreDetail(id) {
-    return request.get('/experienceStore/detail/' + id, {}, { login: true })
-}

api/rooms.js

@@ -1,29 +0,0 @@
-import request from "@/utils/request";
-/**
- * 获取未读消息数量
- */
-export function getUnreadMessageCount() {
-  return request.get("/user/reply/messages/unreadCount", {}, {login: true})
-}
-
-/**
- * 标记消息为已读
- */
-export function markMessagesAsRead() {
-  return request.post("/user/reply/messages/readAll", {}, {login: true})
-}
-
-/**
- * 获取消息列表
- */
-export function getMessageList(params) {
-  return request.get("/user/reply/messages", params, {login: true})
-}
-
-/**
- * 回复消息
- */
-export function replyMessage(data) {
-  return request.post("/user/reply/add", data, {login: true})
-}
-

api/sojoumOrder.js

@@ -1,74 +0,0 @@
-import request from "@/utils/request";
-/**
- * 旅居团购订单详情
- * @param {*} params
- * @returns
- */
-export function fetchSojoumOrderDetail(params) {
-  return request.get("/travel/travelGroupOrder/detail/" + params.key, params, {
-    login: true
-  })
-}
-
-/**
- * 旅居团购订单退款
- * @param {*} params
- * @returns
- */
-export function sojoumOrderRefund(params) {
-  return request.post("/travel/travelGroupOrder/refund", params, {
-    login: true
-  })
-}
-
-/**
- * 旅居团购订单修改入住时间
- * @param {*} params
- * @returns
- */
-export function sojoumOrderCheckInTime(params) {
-  return request.post("/travel/travelGroupOrder/changeDate", params, {
-    login: true
-  })
-}
-
-/**
- * 获取产品指定月份的预约日历
- * @param {*} params
- * travelGroupProductId int 旅居团购产品ID
-  month string 月份（yyyy-MM）
- * @returns
- */
-export function sojoumOrderCalendar(params) {
-  return request.get("/travel/product/calendar", params, {
-    login: true
-  })
-}
-
-/**
- * 旅居团购订单退款信息
- * @param {*} params
- * @returns
- */
-export function sojoumOrderRefundInfo(params) {
-  return request.post("/travel/travelGroupOrder/refundInfo", params, {
-    login: true
-  })
-}
-
-/**
- * 旅居团购订单检查日期是否可预约
- * @param {*} params
- * @returns
- */
-export function sojoumOrderCheckDate(params) {
-  return request.post("/travel/travelGroupOrder/checkDate", params, {
-    login: true
-  })
-}
-
-export function sojoumOrderComment(params) {
-  return request.post("/travel/travelGroupOrder/comment", params, {
-    login: true
-  })
-}

api/user.js

@@ -578,10 +578,6 @@ export function getHistory(params) {
     return request.get('/history/list', params)
 }
 
-export function deleteHistory(id) {
-    return request.delete(`/history/${id}`)
-}
-
 /**
  * 购物车猜你喜欢
  * @param {*} params 
@@ -602,4 +598,4 @@ export function queryUserGuide(params) {
 
 export function setUserGuide(params) {
     return request.post('/user/guide/status', params)
-}
+}

assets/css/aiChat.less

@@ -12,14 +12,10 @@ page {
 	min-height: 100vh;
 	background: linear-gradient(155deg, rgba(61, 76, 241, 0.15) 0%, rgba(255,255,255,1) 25%, rgba(255,255,255,1) 75%, rgba(61, 76, 241, 0.15) 100%);
   // background-color: #fff;
-	// background-size: 100% calc(100vh - 160rpx);
+	// background-size: 100% 100vh;
 	// background-image: url(https://wxapp.xdd618.com/api/file/pic/aiChat/bg.png);
 	// background-repeat: no-repeat;
 	// background-attachment: fixed;
-	&.new-chat {
-		background-size: 100% calc(100vh - 160rpx);
-	  background-repeat: no-repeat;
-	}
 	.fix-tabbar-header {
 		position: fixed;
 		top: 0;
@@ -94,42 +90,28 @@ page {
   }
 	.page-to-bottom {
 		position: fixed;
-		bottom: 160rpx;
+		bottom: 180rpx;
 		left: 0;
 		right: 0;
 		z-index: 8;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		padding: 0 24rpx;
 		transition: all 0.2s;
 		&.focus {
 			transform: translateY(-40rpx);
 		}
-		.container {
-			display: flex;
-			flex-wrap: nowrap;
-			align-items: center;
-			width: 100%;
-			padding: 24rpx;
-			box-sizing: border-box;
-			overflow-x: auto;
-		}
-		.container-county {
-			justify-content: flex-end;
-			.new-chat {
-				margin-right: 0;
-			}
-		}
 		.new-chat {
 			display: flex;
 			align-items: center;
-			flex-shrink: 0;
+			height: 68rpx;
-			height: 64rpx;
 			padding: 0 24rpx;
-			margin: 0 20rpx 0 0;
+			border-radius: 40rpx;
-			border-radius: 16rpx;
+			line-height: 68rpx;
-			line-height: 64rpx;
 			font-size: 30rpx;
-			color: #fff;
+			background-color: #fff;
-			background-color: #3D4CF1;
+			box-shadow: 0rpx 6rpx 12rpx rgba(0,0,0,0.16);
-			box-shadow: 0rpx 0 12rpx rgba(74,74,74,0.2);
 			.btn-icon {
 				display: block;
 				width: 40rpx;
@@ -137,48 +119,13 @@ page {
 				margin: 0 8rpx 0 0;
 			}
 		}
-		.down-icon-wrap {
-			display: flex;
-			justify-content: flex-end;
-			padding: 0 24rpx 0 0;
-		}
 		.icon {
 			display: block;
-			flex-shrink: 0;
+			width: 68rpx;
-			width: 64rpx;
+			height: 68rpx;
-			height: 64rpx;
+			margin: 0 0 0 24rpx;
-			border-radius: 16rpx;
+			border-radius: 50%;
-			background-color: #fff;
+			box-shadow: 0rpx 6rpx 12rpx rgba(0,0,0,0.16);
-			box-shadow: 0rpx 0 12rpx rgba(74,74,74,0.2);
-		}
-		.bottom-tool-item {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-shrink: 0;
-			height: 64rpx;
-			padding: 0 24rpx;
-			margin: 0 20rpx 0 0;
-			border-radius: 16rpx;
-			font-size: 30rpx;
-			color: #333;
-			background-color: #fff;
-			box-shadow: 0rpx 6rpx 20rpx rgba(74,74,74,0.1);
-			&:last-child {
-				margin-right: 0;
-			}
-			&.hide {
-				display: none;
-			}
-			.tool-icon {
-				display: block;
-				width: 32rpx;
-				height: 32rpx;
-				padding: 0;
-				margin: 0 12rpx 0 0;
-				background-color: none;
-				box-shadow: none;
-			}
 		}
 	}
 	.fix-page-bottom {
@@ -212,7 +159,7 @@ page {
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				min-height: 100rpx;
+				height: 100rpx;
 				width: calc(100% - 122rpx);
 				padding: 6rpx 6rpx 6rpx 24rpx;
 				border-radius: 30rpx;
@@ -235,13 +182,11 @@ page {
 					z-index: 5;
 					width: 100%;
 					height: 88rpx;
-					max-height: 220rpx;
 					border: 0;
 					box-sizing: border-box;
-					line-height: 48rpx;
+					line-height: 88rpx;
 					color: #333;
 					font-size: 30rpx;
-					overflow-y: auto;
 				}
 				.placeholder-txt {
 					position: absolute;
@@ -524,7 +469,7 @@ page {
 				.txt {
 					max-width: 100%;
 					padding: 20rpx 32rpx;
-					border-radius: 40rpx 0 40rpx 40rpx;
+					border-radius: 40rpx 40rpx 0 40rpx;
 					box-sizing: border-box;
 					color: #fff;
 					font-size: 30rpx;
@@ -542,20 +487,6 @@ page {
 					}
 				}
 			}
-			.item-right-tools {
-				display: flex;
-				justify-content: flex-end;
-				padding: 20rpx 0 0 0;
-				.btn {
-					display: flex;
-					font-size: 24rpx;
-					.icon {
-						display: block;
-						width: 36rpx;
-						margin: 0 8rpx 0 0;
-					}
-				}
-			}
 			.bottom-btns {
 				position: relative;
 				display: flex;
@@ -587,9 +518,6 @@ page {
 					margin: 0;
 					color: transparent;
 				}
-				.playing {
-					color: #3D4CF1;
-				}
 			}
 		}
 	}
@@ -1087,413 +1015,15 @@ page {
 			}
 		}
 	}
-	.prize-list-wrap {
-		display: block;
-		.prize-item {
-			.img {
-				display: block;
-				width: 100%;
-				border-radius: 20rpx;
-			}
-		}
-	}
 	.change-btn {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		padding: 0 0 20rpx 0;
-		.change-btn-content {
+		.icon {
-			display: flex;
+			display: block;
-			align-items: center;
+			width: 124rpx;
-			justify-content: center;
+			height: 38rpx;
-			color: #3D4CF0;
-			font-size: 28rpx;
-			.icon {
-				display: block;
-				width: 32rpx;
-				height: 32rpx;
-				margin: 0 8rpx 0 0;
-				&.rotate {
-					animation: spin-icon 1s linear;
-				}
-			}
 		}
 	}
-}
+}
-.weather-holiday-wrap {
-	display: flex;
-	align-items: stretch;
-	justify-content: space-between;
-	gap: 12px;
-	padding: 0 24rpx 48rpx 24rpx;
-	.data-wrap {
-		flex: 1;
-		padding: 20rpx;
-		border-radius: 20rpx;
-		box-sizing: border-box;
-		background-color: #fff;
-		box-shadow: 0rpx 0rpx 20rpx rgba(0,0,0,0.16);
-	}
-	.weather-data {
-		.title {
-			display: flex;
-			align-items: center;
-			color: #3D4CF1;
-			.icon {
-				display: block;
-				width: 100rpx;
-				height: 100rpx;
-				margin: 0 12rpx 0 0;
-			}
-			.tem-wrap {
-				display: flex;
-				align-items: baseline;
-			}
-			.tem {
-				font-size: 70rpx;
-				line-height: 70rpx;
-				font-weight: bold;
-			}
-			.unit {
-				font-size: 36rpx;
-				line-height: 36rpx;
-			}
-		}
-		.loca {
-			display: flex;
-			padding: 24rpx 0;
-			font-size: 26rpx;
-			line-height: 36rpx;
-			color: #333;
-			.addr {
-				display: flex;
-				align-items: center;
-				.icon {
-					display: block;
-					width: 24rpx;
-					height: 24rpx;
-					margin: 0 4rpx 0 0;
-				}
-			}
-			.tem-range {
-				padding: 0 0 0 24rpx;
-			}
-		}
-		.content + .content {
-			padding: 12rpx 0 0 0;
-		}
-		.content {
-			color: #3D4CF1;
-			font-size: 26rpx;
-			line-height: 36rpx;
-			font-weight: bold;
-		}
-		.txt-loading {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-size: 28rpx;
-			min-height: 200rpx;
-		}
-		.no-weather {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			height: 100%;
-			font-size: 26rpx;
-			color: #999;
-			line-height: 38rpx;
-			.img {
-				display: block;
-				width: 226rpx;
-				height: 130rpx;
-				margin: 0 0 12rpx 0;
-			}
-		}
-	}
-	.holiday-data {
-		.title {
-			display: flex;
-			font-size: 24rpx;
-			color: #333;
-			line-height: 36rpx;
-			.day {
-				margin: 0 8rpx 0 0;
-				color: #3D4CF1;
-				font-size: 28rpx;
-			}
-		}
-		.desc {
-			font-size: 24rpx;
-			color: #333;
-			line-height: 36rpx;
-		}
-		.tip {
-			display: flex;
-			flex-wrap: wrap;
-			padding: 20rpx 0 0 0;
-			.label {
-				display: block;
-				width: 32rpx;
-				height: 32rpx;
-				margin: 0 12rpx 0 0;
-				border-radius: 8rpx;
-				text-align: center;
-				line-height: 32rpx;
-				font-size: 24rpx;
-				color: #fff;
-				background-color: #3D4CF1;
-			}
-			.label2 {
-				background-color: #C52733;
-			}
-			.content {
-				width: calc(100% - 44rpx);
-				margin: -6rpx 0 0 0;
-				font-size: 24rpx;
-			}
-		}
-	}
-}
-.recommend-goods-wrap {
-  width: calc(100% + 48rpx);
-  padding: 24rpx 0;
-  margin: 0 -24rpx;
-  .goods-swiper {
-    width: 100%;
-    height: 750rpx;
-  }
-  .goods-item {
-    display: block;
-    width: 460rpx;
-    margin: 24rpx auto 0 auto;
-    padding: 24rpx;
-    box-sizing: border-box;
-    background: #fff;
-    border-radius: 20rpx;
-    box-shadow: 0rpx 0 24rpx rgba(0,0,0,0.16);
-    white-space: normal;
-    transition: all 0.3s ease;
-    transform: scale(0.9);
-    opacity: 0.8;
-    &.active {
-      transform: scale(1);
-      opacity: 1;
-    }
-    .supplier {
-      display: flex;
-      align-items: center;
-      font-size: 24rpx;
-      color: #666;
-      margin-bottom: 16rpx;
-      .icon {
-        display: block;
-        width: 28rpx;
-        height: 28rpx;
-      }
-      .s-name {
-        flex: 1;
-        margin: 0 8rpx;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-    .title {
-      font-size: 28rpx;
-      font-weight: bold;
-      color: #333;
-      margin-bottom: 16rpx;
-      line-height: 40rpx;
-    }
-    .p-img {
-      width: 412rpx;
-      height: 412rpx;
-      margin-bottom: 16rpx;
-      border-radius: 12rpx;
-      background-color: #f5f5f5;
-    }
-    .price {
-      color: #C52733;
-      text-align: center;
-      margin-bottom: 16rpx;
-      .unit {
-        font-size: 28rpx;
-        font-weight: bold;
-      }
-      .num {
-        font-size: 36rpx;
-        font-weight: bold;
-      }
-    }
-    .actions {
-      display: flex;
-      justify-content: center;
-      .btn-buy {
-        width: 160rpx;
-        height: 56rpx;
-        margin: 0 12rpx;
-        line-height: 56rpx;
-        text-align: center;
-        background: #C52733;
-        color: #fff;
-        font-size: 24rpx;
-        border-radius: 28rpx;
-      }
-      .btn-gift {
-        width: 160rpx;
-        height: 56rpx;
-        margin: 0 12rpx;
-        line-height: 52rpx;
-        text-align: center;
-        background: #fff;
-        color: #C52733;
-        font-size: 24rpx;
-        border-radius: 28rpx;
-        border: 2rpx solid #C52733;
-        box-sizing: border-box;
-      }
-    }
-  }
-}
-.order-list-wrap {
-  width: 100%;
-  padding: 24rpx 0;
-  box-sizing: border-box;
-  .order-item-wrap + .order-item-wrap {
-    margin: 24rpx 0 0 0;
-  }
-}
-
-@keyframes spin-icon {
-	0% {
-		transform: rotate(0deg);
-	}
-	100% {
-		transform: rotate(720deg);
-	}
-}
-
-.gift-steps-wrap {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 100%;
-  padding: 0 80rpx;
-  box-sizing: border-box;
-
-  .gift-step-title {
-    font-size: 36rpx;
-    font-weight: bold;
-    color: #333;
-    margin-bottom: 60rpx;
-    text-align: center;
-  }
-
-  .gift-options {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    width: 100%;
-
-    .gift-option-item {
-      width: 48%;
-      height: 72rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #f2f4ff;
-      color: #333;
-      border-radius: 12rpx;
-      margin-bottom: 20rpx;
-      font-size: 28rpx;
-      position: relative;
-      transition: all 0.2s;
-
-      &.active {
-        background-color: #3D4CF0;
-        color: #fff;
-      }
-
-      .icon-check {
-        margin-left: 8rpx;
-        width: 32rpx;
-        height: 32rpx;
-      }
-    }
-  }
-
-  .gift-price-input {
-    width: 100%;
-    margin-bottom: 40rpx;
-    
-    .input-wrap {
-      display: flex;
-      align-items: center;
-      padding: 0 24rpx;
-      height: 88rpx;
-      background-color: #f2f4ff;
-      border-radius: 12rpx;
-      
-      .label {
-        font-size: 28rpx;
-        color: #333;
-        white-space: nowrap;
-      }
-      
-      .input-budget {
-        flex: 1;
-        font-size: 28rpx;
-        color: #333;
-        padding-left: 10rpx;
-      }
-    }
-  }
-
-  .gift-step-actions {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .action-btn-group {
-      display: flex;
-      justify-content: space-between;
-      width: 100%;
-      margin-bottom: 20rpx;
-
-      .btn {
-        height: 62rpx;
-        line-height: 62rpx;
-        text-align: center;
-        border-radius: 12rpx;
-        font-size: 30rpx;
-
-        &-prev {
-          width: 48%;
-          background-color: #fff;
-          color: #3D4CF0;
-          border: 2rpx solid #3D4CF0;
-          box-sizing: border-box;
-        }
-
-        &-next {
-          width: 48%;
-          background-color: #3D4CF0;
-          color: #fff;
-          
-          &.full-width {
-            width: 100%;
-          }
-        }
-      }
-    }
-
-    .btn-skip {
-      font-size: 28rpx;
-      color: #3D4CF0;
-      padding: 10rpx 20rpx;
-    }
-  }
-}

assets/css/base.less

@@ -295,8 +295,4 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
   font-style: normal;
   font-size: 28rpx;
   color: #C2C5CC;
-}
-
-.bg-color-hui {
-  background-color: #999 !important;
 }

assets/css/reset.less

@@ -37,12 +37,6 @@ input{line-height: normal; box-sizing:border-box;}
 .line1{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width: 100%;}
 .line2{word-break:break-all;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;}
 .mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:55;background-color:rgba(0,0,0,0.5);}
-.ai-product-window.product-window {
-  z-index: 1002;
-}
-.ai-product-window.mask {
-  z-index: 1001;
-}
 
 
 

assets/css/style.less

@@ -8231,192 +8231,3 @@ rich-text {
     font-size: 28rpx;
   }
 }
-
-.draw-ticket-mask {
-  position: fixed;
-  inset: 0;
-  z-index: 1000;
-  background: rgba(0, 0, 0, 0.45);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 24rpx;
-  box-sizing: border-box;
-}
-.draw-ticket-popup {
-  width: 100%;
-  max-width: 640rpx;
-  background: #fff;
-  border-radius: 40rpx;
-  padding: 50rpx 40rpx 60rpx;
-  position: relative;
-  box-sizing: border-box;
-
-  .draw-ticket-close {
-    position: absolute;
-    top: 30rpx;
-    right: 30rpx;
-    width: 40rpx;
-    height: 40rpx;
-    border: 4rpx solid #333;
-    border-radius: 50%;
-    color: #333;
-    text-align: center;
-    font-weight: bold;
-    z-index: 10;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    line-height: 40rpx;
-  }
-
-  .draw-ticket-icon {
-    display: flex;
-    justify-content: center;
-    margin-top: 20rpx;
-  }
-
-  .ticket-icon-box {
-    width: 100rpx;
-    height: 70rpx;
-    border-radius: 10rpx;
-    position: relative;
-    box-sizing: border-box;
-  }
-
-  .ticket-icon-check {
-    width: 100%;
-    height: 100%;
-  }
-
-  .draw-ticket-title {
-    font-size: 56rpx;
-    color: #222;
-    font-weight: 800;
-    text-align: center;
-    margin-top: 24rpx;
-    letter-spacing: 2rpx;
-  }
-
-  .ticket-card-container {
-    margin-top: 50rpx;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  .ticket-badge {
-    background-color: #fff9eb;
-    border: 6rpx solid #111;
-    border-radius: 40rpx;
-    padding: 12rpx 40rpx;
-    font-size: 46rpx;
-    font-weight: 800;
-    color: #222;
-    position: relative;
-    z-index: 2;
-    margin-bottom: -36rpx;
-    letter-spacing: 2rpx;
-  }
-
-  .ticket-badge-arrow {
-    position: absolute;
-    bottom: -22rpx;
-    left: 50%;
-    transform: translateX(-50%);
-    width: 0;
-    height: 0;
-    border-left: 22rpx solid transparent;
-    border-right: 22rpx solid transparent;
-    border-top: 22rpx solid #111;
-
-    &::after {
-      content: '';
-      position: absolute;
-      top: -26rpx;
-      left: -16rpx;
-      border-left: 16rpx solid transparent;
-      border-right: 16rpx solid transparent;
-      border-top: 16rpx solid #fff9eb;
-    }
-  }
-
-  .ticket-card {
-    width: 100%;
-    background: #c23326;
-    border-radius: 36rpx;
-    padding: 70rpx 36rpx 40rpx;
-    box-sizing: border-box;
-    text-align: center;
-    position: relative;
-  }
-
-  .ticket-card-subtitle {
-    display: flex;
-    justify-content: center;
-  }
-
-  .ticket-card-subtitle-text {
-    color: #fff;
-    font-size: 34rpx;
-    font-weight: 700;
-    border: 2rpx solid #fff;
-    border-radius: 40rpx;
-    padding: 8rpx 50rpx;
-    letter-spacing: 4rpx;
-  }
-
-  .ticket-card-code-box {
-    background: #fff;
-    border-radius: 20rpx;
-    margin-top: 36rpx;
-    padding: 36rpx 0;
-  }
-
-  .ticket-card-code {
-    color: #c23326;
-    font-size: 72rpx;
-    font-weight: 800;
-    letter-spacing: 8rpx;
-  }
-
-  .ticket-card-time {
-    color: #fff;
-    font-size: 30rpx;
-    margin-top: 36rpx;
-    text-align: left;
-  }
-
-  .draw-ticket-actions {
-    margin-top: 60rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 20rpx;
-
-    .action-btn {
-      flex: 1;
-      height: 86rpx;
-      border-radius: 44rpx;
-      font-size: 32rpx;
-      font-weight: 600;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      box-sizing: border-box;
-      white-space: nowrap;
-
-      &.home-btn {
-        color: #c23326;
-        border: 2rpx solid #c23326;
-        background: #fff;
-      }
-
-      &.primary {
-        color: #fff;
-        background: #c23326;
-      }
-    }
-  }
-}

assets/css/v12-style.less

@@ -3,8 +3,8 @@
 @dark-color: #333333;
 @white-color: #fff;
 
-@colors: #C52733, #333333, #fff, #666, #F0F0F0, #999999, #E92727, #FFC543, #69C573, #A5A5A5;
+@colors: #C52733, #333333, #fff, #666, #F0F0F0, #999999, #E92727, #FFC543, #69C573;
-@classnames: primary, dark, white, secondary-dark, grey, dark1, red, yellow, success, dark2;
+@classnames: primary, dark, white, secondary-dark, grey, dark1, red, yellow, success;
 /*=====================================*/ 
 
 each(@colors, {

components/CheckboxIcon_bak20240206.vue

@@ -0,0 +1,57 @@
+<template>
+  <view class="components-checkbox-icon jc-center ai-center" :class="{'isSelected':isSelected}" @click="change"
+        v-if="ready">
+    <image class="icon-hook" :src="webUrl+'/20240109175325131970.png'" mode="scaleToFill" v-if="isSelected"/>
+  </view>
+</template>
+
+<script setup>
+import {computed, getCurrentInstance, onMounted, ref} from '@vue/composition-api'
+import {VUE_APP_RESOURCES_URL} from '../config/index'
+
+const webUrl = VUE_APP_RESOURCES_URL
+
+const emit = defineEmits(['change'])
+const {proxy} = getCurrentInstance()
+const props = defineProps({
+  defaultState: {
+    type: Boolean,
+    default: false
+  },
+  mark: Array
+})
+
+const ready = ref(false)
+onMounted(() => {
+  ready.value = true
+})
+
+
+const isSelected = computed(() => {
+  return props.defaultState
+})
+const change = () => {
+  emit('change', !isSelected.value, props.mark)
+}
+</script>
+
+<style scoped lang="less">
+.components-checkbox-icon {
+  display: inline-flex;
+  width: 32rpx;
+  height: 32rpx;
+  box-sizing: border-box;
+  border: 2rpx solid #D5D7D8;
+  border-radius: 50%;
+}
+
+.icon-hook {
+  width: 24rpx;
+  height: 24rpx;
+}
+
+.isSelected {
+  border: 3px solid #FD5749;
+  background: #FD5749;
+}
+</style>

components/Coupons.vue

@@ -6,7 +6,7 @@
         class="coupons__cover"
         mode="widthFix"
       />
-      <view @click="selectCoupon" class="check-radio" :class="{'v12-primary': data.checked}" v-if="showRadio">
+      <view @click="selectCoupon" class="check-radio" :class="{'v12-primary': data.checked}">
         <radio
           v-if="radioModel && data.status === 0"
           :value="data.id"
@@ -50,10 +50,6 @@
 export default {
   name: "Coupons",
   props: {
-    showRadio: {
-      type: Boolean,
-      default: true
-    },
     data: {
       type: Object,
       default: () => {

components/CouponsPopup.vue

@@ -14,8 +14,7 @@
         @change="changeNav"
         v-if="showTab"
       />
-      <!-- 先隐藏 -->
+      <view class="v12-radius-20 v12-white v12-align-center v12-justify-around v12-pa-3" v-else>
-      <!-- <view class="v12-radius-20 v12-white v12-justify-around v12-pa-3" style="align-items: flex-end;" v-if="!showTab && showRadio">
         <view class="">
           <view class="v12-text-center v12-font-28">
             券后价
@@ -30,10 +29,7 @@
           </view>
         </view>
         <view class="v12-text-center  v12-font-44">
-          <view class="v12-text-center v12-font-28">
+          =
-            &nbsp;
-          </view>
-          <view class="v12-mt-3 v12-text-center">=</view>
         </view>
         <view class="">
           <view class="v12-text-center v12-font-28">
@@ -49,10 +45,7 @@
           </view>
         </view>
         <view class="v12-text-center  v12-font-44">
-          <view class="v12-text-center v12-font-28">
+          -
-            &nbsp;
-          </view>
-          <view class="v12-mt-3 v12-text-center">-</view>
         </view>
         <view class="">
           <view class="v12-text-center">
@@ -62,13 +55,12 @@
             {{ selectItem.couponPrice || 0 }}
           </view>
         </view>
-      </view> -->
+      </view>
       
       <view class="list-box">
         <view class="larg-one v12-mb-3">
           <Coupons
             :data="largOne"
-            :showRadio="showRadio"
             :radio-model="current === 0"
             @change="selectCoupon"
           />
@@ -83,7 +75,6 @@
         >
           <Coupons
             :data="item"
-            :showRadio="showRadio"
             :radio-model="current === 0"
             @change="selectCoupon"
             v-if="index !== maxIndex"
@@ -102,7 +93,7 @@
     </view>
     <button disabled></button>
     <view
-      v-if="current === 0 && showRadio"
+      v-if="current === 0"
       :class="{ 'btn-disabled': current === 1 }"
       class="btn-done bold flex jc-center ai-center v12-primary"
       @click="setCoupon"
@@ -120,10 +111,6 @@ export default {
   name: 'CouponsPopup',
   components: { SubSection, Coupons },
   props: {
-    showRadio: {
-      type: Boolean,
-      default: true
-    },
     twoList: {
       type: Object,
       default: {
@@ -142,10 +129,6 @@ export default {
     id: {
       type: Number,
       default: 0
-    },
-    couponId1: {
-      type: Number,
-      default: 0
     }
   },
   data() {
@@ -159,11 +142,10 @@ export default {
     }
   },
   watch: {
-    couponId1: {
+    id: {
       immediate: true,
       handler(value) {
-        console.log(value);
+        console.log('couponId', value);
-        
         if(value) {
           this.selectCoupon(value)
         }
@@ -174,7 +156,7 @@ export default {
     list() {
       const temp = this.current === 0 ? this.twoList['usable'] : this.twoList['unusable']
       if (this.current === 0) {
-        const localCouponId = this.couponId1 || 0
+        const localCouponId = uni.getStorageSync('couponId') || 0
         temp.map(item => {
           item.checked = localCouponId === item.id
         })
@@ -198,8 +180,8 @@ export default {
     },
     largOne() {
       if(this.list[this.maxIndex]) {
-        // this.selectCoupon(this.list[this.maxIndex].id)
+        this.selectCoupon(this.list[this.maxIndex].id)
-        // uni.setStorageSync('couponId', this.list[this.maxIndex].id)
+        uni.setStorageSync('couponId', this.list[this.maxIndex].id)
       }
       // this.$emit('max', this.list[this.maxIndex] || {})
       return this.list[this.maxIndex] || {}
@@ -211,17 +193,7 @@ export default {
   },
   methods: {
     close() {
-      
-      this.couponId = this.couponId1
-      this.selectItem = this.list.find(e => e.id === this.couponId1) || {}
-      // this.$emit('select', this.selectItem)
-      this.list.map(item => {
-        item.checked = this.couponId1 === item.id
-      })
       this.$emit('close')
-      // uni.setStorageSync('couponId', this.couponId)
-      // this.$emit('change', this.selectItem || {})
-      // this.$emit('ok', this.couponId)
     },
     force2Decimal(value) {
       return this.$force2Decimal(value);
@@ -239,6 +211,7 @@ export default {
     },
     setCoupon() {
       if (this.current === 1) return
+      console.log(this.current, '====1=======');
       uni.setStorageSync('couponId', this.couponId)
       this.$emit('change', this.selectItem || {})
       this.$emit('ok', this.couponId)

components/DateRangePicker/DateRangePicker.vue

@@ -1,813 +0,0 @@
-<template>
-  <view class="date-range-picker">
-    <u-popup :show="show" @close="handleClose" mode="center" round="16" closeable>
-      <view class="picker-container">
-        <view class="picker-header">
-          <text class="title">查看可预约日期</text>
-        </view>
-        <view class="v12-align-center v12-justify-between">
-          <view class="v12-my-3">
-            <text class="v12-font-24 v12-dark-text v12-mr-3">请选择入住日期</text>
-            <text class="v12-font-24 v12-primary-text">{{ `  共计${minBookingDays}天  ` }}</text>
-          </view>
-          <view v-if="originDate" class="v12-font-24 v12-primary-text">
-            原定时间：{{ originDate }}
-          </view>
-        </view>
-        <view class="calendar" @touchstart="onTouchStart" @touchend="onTouchEnd">
-          <view class="calendar-header">
-            <view class="month-nav">
-              <text class="nav-btn" @click="changeMonth(-1)">〈</text>
-              <text class="month-text">{{ currentYear }}年{{ currentMonth + 1 }}月</text>
-              <text class="nav-btn" @click="changeMonth(1)">〉</text>
-            </view>
-            <view class="weekdays">
-              <text v-for="day in ['日', '一', '二', '三', '四', '五', '六']" :key="day" class="weekday v12-dark-text">
-                {{ day }}
-              </text>
-            </view>
-          </view>
-
-          <view class="calendar-body">
-            <view class="days" :class="[isAnimating ? 'absolute ' + transitionMode + '-enter' : '']">
-              <view 
-                v-for="(day, index) in calendarDays" 
-                :key="index"
-                class="day"
-                :class="{
-                  'empty': !day,
-                  'selected': isSelected(day),
-                  'in-range': isInRange(day),
-                  'start-date': isStartDate(day),
-                  'end-date': isEndDate(day),
-                  'selecting-start': isSelectingStart(day),
-                  'disabled': isDisabled(day),
-                  'booked': getDateStatus(day) === '已被预约',
-                  'unavailable': getDateStatus(day) === '不可预约',
-                  'available': getDateStatus(day) === '可预约'
-                }"
-                @click="selectDate(day)"
-              >
-                <text>{{ day || '' }}</text>
-                <view class="v12-font-20" v-if="day && getDateStatus(day) !== null">{{ getDateStatus(day)  }}</view>
-              </view>
-            </view>
-
-            <view class="days absolute" v-if="isAnimating" :class="[transitionMode + '-leave']">
-              <view 
-                v-for="(day, index) in prevMonthDays" 
-                :key="'prev-' + index"
-                class="day"
-                :class="{
-                  'empty': !day,
-                  'selected': isSelected(day, prevYear, prevMonth),
-                  'in-range': isInRange(day, prevYear, prevMonth),
-                  'start-date': isStartDate(day, prevYear, prevMonth),
-                  'end-date': isEndDate(day, prevYear, prevMonth),
-                  'selecting-start': isSelectingStart(day, prevYear, prevMonth),
-                  'disabled': isDisabled(day, prevYear, prevMonth),
-                  'booked': getDateStatus(day, prevYear, prevMonth) === '已被预约',
-                  'unavailable': getDateStatus(day, prevYear, prevMonth) === '不可预约',
-                  'available': getDateStatus(day, prevYear, prevMonth) === '可预约'
-                }"
-              >
-                <text>{{ day || '' }}</text>
-                <view class="v12-font-20" v-if="day && getDateStatus(day, prevYear, prevMonth) !== null">{{ getDateStatus(day, prevYear, prevMonth)  }}</view>
-              </view>
-            </view>
-          </view>
-        </view>
-
-        <view class="picker-footer">
-          <button class="btn btn-confirm" @click="confirmSelect">立即预订</button>
-        </view>
-      </view>
-    </u-popup>
-  </view>
-</template>
-
-<script>
-import { sojoumOrderCalendar, sojoumOrderCheckDate } from "@/api/sojoumOrder";
-export default {
-  name: 'DateRangePicker',
-  
-  props: {
-    originDate: {
-      type: String,
-      default: ''
-    },
-    show: {
-      type: Boolean,
-      default: false
-    },
-    value: {
-      type: Array,
-      default: () => [null, null]
-    },
-    minDate: {
-      type: [String, Date],
-      default: null
-    },
-    maxDate: {
-      type: [String, Date],
-      default: null
-    },
-    format: {
-      type: String,
-      default: 'YYYY-MM-DD'
-    },
-    travelGroupProductId: {
-      type: String,
-      default: ''
-    },
-    minBookingDays: {
-      type: Number,
-      default: 0
-    },
-  },
-
-  data() {
-    return {
-      currentYear: new Date().getFullYear(),
-      currentMonth: new Date().getMonth(),
-      startDate: null,
-      endDate: null,
-      activeCalendar: 'start', // 'start' or 'end'
-      tempStartDate: null,
-      tempEndDate: null,
-      dateStatusMap: {}, // 存储日期状态
-      selectionState: 'initial', // 'initial' | 'selecting' | 'completed'
-      touchStartX: 0,
-      touchStartY: 0,
-      // 动画相关状态
-      isAnimating: false,
-      transitionMode: '', // 'next' or 'prev'
-      prevYear: null,
-      prevMonth: null,
-      prevMonthDays: []
-    }
-  },
-
-  computed: {
-    calendarDays() {
-      const days = []
-      const firstDay = new Date(this.currentYear, this.currentMonth, 1)
-      const lastDay = new Date(this.currentYear, this.currentMonth + 1, 0)
-      
-      // 填充月初空白天数
-      for (let i = 0; i < firstDay.getDay(); i++) {
-        days.push(null)
-      }
-      
-      // 填充当月天数
-      for (let i = 1; i <= lastDay.getDate(); i++) {
-        days.push(i)
-      }
-      
-      // 填充月末空白天数
-      const remainingDays = 42 - days.length // 保持6行固定高度
-      for (let i = 0; i < remainingDays; i++) {
-        days.push(null)
-      }
-      
-      return days
-    }
-  },
-
-  watch: {
-    show(newVal) {
-      if (newVal) {
-        this.initDates()
-        this.getDays()
-      }
-    },
-    currentMonth() {
-      this.getDays()
-    },
-    currentYear() {
-      this.getDays()
-    },
-    value: {
-      handler(newVal) {
-        if (newVal && newVal.length === 2) {
-          this.startDate = newVal[0] ? new Date(newVal[0]) : null
-          this.endDate = newVal[1] ? new Date(newVal[1]) : null
-          this.tempStartDate = this.startDate
-          this.tempEndDate = this.endDate
-        }
-      },
-      immediate: true
-    }
-  },
-
-  methods: {
-    getDays(){
-      // uni.showLoading({
-      //   title: '加载中...',
-      //   mask: true,
-      // })
-      sojoumOrderCalendar({
-        travelGroupProductId: this.travelGroupProductId,
-        month: `${this.currentYear}-${String(this.currentMonth + 1).padStart(2, '0')}`
-      }).then(res => {
-        if (res.data) {
-          // 更新日期状态映射，使用合并而不是覆盖，以支持动画时的旧数据显示
-          const newStatusMap = {}
-          res.data.forEach(day => {
-            // inventoryStatus int 状态 (0:可预约, 1:已被预约, 2:不可预约)
-            newStatusMap[day.date] = day.inventoryStatus === 0 ? '可预约' : day.inventoryStatus === 1 ? '已被预约' : '不可预约'
-          })
-          this.dateStatusMap = { ...this.dateStatusMap, ...newStatusMap }
-        }
-      }).finally(() => {
-        uni.hideLoading()
-      })
-    },
-
-    getDateStatus(day, year, month) {
-      if (!day) return null
-      const date = this.formatDate(this.getDateFromDay(day, year, month))
-      return this.dateStatusMap[date]
-    },
-
-    isDisabled(day, year, month) {
-      
-      if (!day) return true
-      const date = this.getDateFromDay(day, year, month)
-      // 禁用过去的日期（今天之前的日期）
-      const today = new Date()
-      today.setHours(0, 0, 0, 0)
-      if (date < today) return true
-      
-      // 检查最小和最大日期限制
-      if (this.minDate && date < new Date(this.minDate)) return true
-      if (this.maxDate && date > new Date(this.maxDate)) return true
-      
-      // 检查预约状态
-      const status = this.getDateStatus(day, year, month)
-      // 只允许选择可预约的日期（状态为"可预约"），其他状态都禁用
-      
-      return status !== '可预约'
-    },
-    initDates() {
-      this.tempStartDate = this.startDate
-      this.tempEndDate = this.endDate
-      
-      // 根据当前选择状态设置selectionState
-      if (this.tempStartDate && this.tempEndDate) {
-        this.selectionState = 'completed'
-        this.activeCalendar = 'start'
-      } else if (this.tempStartDate) {
-        this.selectionState = 'selecting'
-        this.activeCalendar = 'end'
-      } else {
-        this.selectionState = 'initial'
-        this.activeCalendar = 'start'
-      }
-      
-      if (this.startDate) {
-        this.currentYear = this.startDate.getFullYear()
-        this.currentMonth = this.startDate.getMonth()
-      } else {
-        const now = new Date()
-        this.currentYear = now.getFullYear()
-        this.currentMonth = now.getMonth()
-      }
-    },
-
-    changeMonth(delta) {
-      if (this.isAnimating) return
-
-      // Setup animation state
-      this.prevYear = this.currentYear
-      this.prevMonth = this.currentMonth
-      this.prevMonthDays = [...this.calendarDays]
-      this.transitionMode = delta > 0 ? 'next' : 'prev'
-      this.isAnimating = true
-
-      let newMonth = this.currentMonth + delta
-      if (newMonth < 0) {
-        this.currentYear--
-        newMonth = 11
-      } else if (newMonth > 11) {
-        this.currentYear++
-        newMonth = 0
-      }
-      this.currentMonth = newMonth
-
-      // Reset animation state after transition
-      setTimeout(() => {
-        this.isAnimating = false
-        this.prevMonthDays = []
-      }, 300)
-    },
-
-    onTouchStart(e) {
-      if (!e || !e.changedTouches || !e.changedTouches.length) return
-      this.touchStartX = e.changedTouches[0].clientX
-      this.touchStartY = e.changedTouches[0].clientY
-    },
-
-    onTouchEnd(e) {
-      if (!e || !e.changedTouches || !e.changedTouches.length) return
-      const touchEndX = e.changedTouches[0].clientX
-      const touchEndY = e.changedTouches[0].clientY
-      const deltaX = touchEndX - this.touchStartX
-      const deltaY = touchEndY - this.touchStartY
-      if (Math.abs(deltaX) <= Math.abs(deltaY)) return
-      const minDistance = 50
-      if (Math.abs(deltaX) < minDistance) return
-      if (deltaX < 0) {
-        this.changeMonth(1)
-      } else {
-        this.changeMonth(-1)
-      }
-    },
-
-    formatDate(date) {
-      if (!date) return ''
-      const year = date.getFullYear()
-      const month = String(date.getMonth() + 1).padStart(2, '0')
-      const day = String(date.getDate()).padStart(2, '0')
-      return `${year}-${month}-${day}`
-    },
-
-    getDateFromDay(day, year, month) {
-      const y = year !== undefined ? year : this.currentYear
-      const m = month !== undefined ? month : this.currentMonth
-      return day ? new Date(y, m, day) : null
-    },
-
-    // isDisabled(day) {
-    //   if (!day) return true
-    //   const date = this.getDateFromDay(day)
-      
-    //   // 禁用过去的日期（今天之前的日期）
-    //   const today = new Date()
-    //   today.setHours(0, 0, 0, 0)
-    //   if (date < today) return true
-      
-    //   // 检查最小和最大日期限制
-    //   if (this.minDate && date < new Date(this.minDate)) return true
-    //   if (this.maxDate && date > new Date(this.maxDate)) return true
-      
-    //   return false
-    // },
-
-    isSelected(day, year, month) {
-      if (!day) return false
-      // const date = this.getDateFromDay(day, year, month) // Unused?
-      return this.isStartDate(day, year, month) || this.isEndDate(day, year, month)
-    },
-
-    isStartDate(day, year, month) {
-      if (!day || !this.tempStartDate) return false
-      const date = this.getDateFromDay(day, year, month)
-      return date.getTime() === this.tempStartDate.getTime()
-    },
-
-    isEndDate(day, year, month) {
-      if (!day || !this.tempEndDate) return false
-      const date = this.getDateFromDay(day, year, month)
-      return date.getTime() === this.tempEndDate.getTime()
-    },
-
-    isInRange(day, year, month) {
-      if (!day || !this.tempStartDate || !this.tempEndDate) return false
-      const date = this.getDateFromDay(day, year, month)
-      return date > this.tempStartDate && date < this.tempEndDate
-    },
-
-    isSelectingStart(day, year, month) {
-      if (!day || !this.tempStartDate || this.tempEndDate) return false
-      // 只有在选择状态且只有开始日期时才显示特殊样式
-      if (this.selectionState !== 'selecting') return false
-      const date = this.getDateFromDay(day, year, month)
-      return date.getTime() === this.tempStartDate.getTime()
-    },
-
-    selectDate(day, year, month) {
-      if (!day || this.isDisabled(day, year, month)) return
-      
-      const selectedDate = this.getDateFromDay(day, year, month)
-
-      // 如果设置了最小预订天数，则自动计算结束日期
-      if (this.minBookingDays > 0) {
-        this.tempStartDate = selectedDate
-        const endDate = new Date(selectedDate)
-        endDate.setDate(selectedDate.getDate() + this.minBookingDays - 1)
-        this.tempEndDate = endDate
-        this.selectionState = 'completed'
-        return
-      }
-      
-      // 如果已有完整的日期区间（开始日期和结束日期都存在），重置选择
-      if (this.tempStartDate && this.tempEndDate && this.selectionState === 'completed') {
-        // 重置选择状态，将点击的日期作为新的开始日期
-        this.tempStartDate = selectedDate
-        this.tempEndDate = null
-        this.activeCalendar = 'end'
-        this.selectionState = 'selecting'
-        return
-      }
-      
-      // 如果点击已选择的开始日期，则取消选择
-      if (this.tempStartDate && selectedDate.getTime() === this.tempStartDate.getTime()) {
-        this.tempStartDate = null
-        this.tempEndDate = null
-        this.activeCalendar = 'start'
-        this.selectionState = 'initial'
-        return
-      }
-      
-      // 如果点击已选择的结束日期，则只清除结束日期
-      if (this.tempEndDate && selectedDate.getTime() === this.tempEndDate.getTime()) {
-        this.tempEndDate = null
-        this.activeCalendar = 'end'
-        this.selectionState = 'selecting'
-        return
-      }
-      
-      if (this.activeCalendar === 'start' || this.selectionState === 'initial') {
-        // 选择开始日期
-        this.tempStartDate = selectedDate
-        this.tempEndDate = null
-        this.activeCalendar = 'end'
-        this.selectionState = 'selecting'
-      } else if (this.activeCalendar === 'end') {
-        if (selectedDate < this.tempStartDate) {
-          // 如果选择的结束日期小于开始日期，将其设为开始日期
-          this.tempStartDate = selectedDate
-          this.tempEndDate = null
-          this.selectionState = 'selecting'
-        } else {
-          // 设置结束日期，完成选择
-          this.tempEndDate = selectedDate
-          this.selectionState = 'completed'
-        }
-      }
-    },
-
-    clearDates() {
-      this.tempStartDate = null
-      this.tempEndDate = null
-      this.activeCalendar = 'start'
-      this.selectionState = 'initial'
-    },
-
-    confirmSelect() {
-      // 验证选择的日期数量
-      if (!this.tempStartDate || !this.tempEndDate) {
-        uni.showToast({
-          title: '请选择起始和结束日期',
-          icon: 'none'
-        })
-        return
-      }
-  
-      // 计算选择的天数
-      const daysDiff = Math.floor((this.tempEndDate - this.tempStartDate) / (1000 * 60 * 60 * 24)) + 1
-      
-      // 必须要选够天数
-      if (daysDiff !== this.minBookingDays) {
-        uni.showToast({
-          title: `此套餐预约需连续选择${this.minBookingDays}天`,
-          icon: 'none'
-        })
-        return
-      }
-  
-      // 验证选择的日期范围内是否包含禁用日期
-      // const currentDate = new Date(this.tempStartDate)
-      // while (currentDate <= this.tempEndDate) {
-      //   const day = currentDate.getDate()
-      //   if (this.isDisabled(day)) {
-      //     uni.showToast({
-      //       title: '所选日期范围包含不可预约日期，请重新选择',
-      //       icon: 'none'
-      //     })
-      //     return
-      //   }
-      //   currentDate.setDate(currentDate.getDate() + 1)
-      // }
-      sojoumOrderCheckDate({
-        travelGroupProductId: this.travelGroupProductId,
-        orderStartDate: this.formatDate(this.tempStartDate),
-        orderEndDate: this.formatDate(this.tempEndDate)
-      }).then(res => {
-        if (res.status === 200) {
-          // 验证通过，更新日期并关闭弹窗
-          this.startDate = this.tempStartDate
-          this.endDate = this.tempEndDate
-          this.selectionState = 'completed'
-          this.$emit('input', [
-            this.startDate ? this.formatDate(this.startDate) : null,
-            this.endDate ? this.formatDate(this.endDate) : null
-          ])
-          this.handleClose(false)
-        } else {
-          uni.showToast({
-            title: res.msg || '所选日期范围包含不可预约日期，请重新选择',
-            icon: 'none'
-          })
-        }
-      })
-    },
-
-    handleClose(shouldClear = false) {
-      if (shouldClear) {
-        this.clearDates()
-        this.startDate = null
-        this.endDate = null
-        this.$emit('input', [null, null])
-      } else {
-        // 恢复到原始状态
-        this.tempStartDate = this.startDate
-        this.tempEndDate = this.endDate
-        if (this.startDate && this.endDate) {
-          this.selectionState = 'completed'
-        } else if (this.startDate) {
-          this.selectionState = 'selecting'
-        } else {
-          this.selectionState = 'initial'
-        }
-      }
-      this.$emit('update:show', false)
-      this.$emit('close')
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.date-range-picker {
-  .picker-container {
-    width: 690rpx;
-    background: #FFFFFF;
-    border-radius: 24rpx;
-    padding: 30rpx;
-    box-sizing: border-box;
-  }
-
-  .picker-header {
-    text-align: center;
-    margin-bottom: 30rpx;
-
-    .title {
-      font-size: 32rpx;
-      font-weight: bold;
-      color: #333333;
-    }
-  }
-
-  .date-display {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 30rpx;
-    padding: 20rpx;
-    background: #F8F8F8;
-    border-radius: 12rpx;
-
-    .date-input {
-      flex: 1;
-      
-      .label {
-        font-size: 24rpx;
-        color: #999999;
-        margin-bottom: 8rpx;
-        display: block;
-      }
-
-      .value {
-        font-size: 28rpx;
-        color: #333333;
-
-        &.placeholder {
-          color: #999999;
-        }
-      }
-    }
-
-    .separator {
-      margin: 0 20rpx;
-      color: #999999;
-      font-size: 28rpx;
-    }
-  }
-
-  .calendar {
-    .calendar-header {
-      margin-bottom: 20rpx;
-
-      .month-nav {
-        display: flex;
-        align-items: center;
-        justify-content: space-evenly;
-        margin-bottom: 20rpx;
-        padding: 0 20rpx;
-
-        .month-text {
-          font-size: 28rpx;
-          color: #333333;
-          font-weight: bold;
-        }
-
-        .nav-btn {
-          padding: 10rpx 20rpx;
-          color: #666666;
-          font-size: 32rpx;
-        }
-      }
-
-      .weekdays {
-        display: flex;
-        justify-content: space-around;
-        
-        .weekday {
-          width: 14.28%;
-          text-align: center;
-          font-size: 24rpx;
-          color: #999999;
-        }
-      }
-    }
-
-    .days {
-      display: flex;
-      flex-wrap: wrap;
-      
-      .day {
-        width: 14.28%;
-        height: 80rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 28rpx;
-        color: #333333;
-        position: relative;
-        flex-direction: column;
-
-        &:not(.selected):not(.disabled) {
-          color: #4B97EB;
-        }
-
-        .status-dot {
-          width: 8rpx;
-          height: 8rpx;
-          border-radius: 50%;
-          margin-top: 4rpx;
-        }
-
-        &.empty {
-          pointer-events: none;
-        }
-
-        &.disabled {
-          color: #CCCCCC;
-          pointer-events: none;
-        }
-
-        &.selected {
-          background: #C52733;
-          color: #FFFFFF;
-          .status-dot {
-            background: #FFFFFF;
-          }
-        }
-
-        &.selecting-start {
-          background: #4B97EB;
-          color: #FFFFFF;
-          border-radius: 8rpx;
-          position: relative;
-          
-          &::after {
-            content: '';
-            position: absolute;
-            top: -2rpx;
-            left: -2rpx;
-            right: -2rpx;
-            bottom: -2rpx;
-            border: 2rpx solid #4B97EB;
-            border-radius: 10rpx;
-            animation: pulse 1.5s infinite;
-          }
-          
-          .status-dot {
-            background: #FFFFFF;
-          }
-        }
-
-        &.in-range {
-          background: rgba(197, 39, 51, 0.1);
-        }
-
-        &.start-date {
-          border-top-left-radius: 8rpx;
-          border-bottom-left-radius: 8rpx;
-        }
-
-        &.end-date {
-          border-top-right-radius: 8rpx;
-          border-bottom-right-radius: 8rpx;
-        }
-
-        &.available .status-dot {
-          background: #4CAF50;
-        }
-
-        &.booked .status-dot {
-          background: #FF9800;
-        }
-
-        &.unavailable .status-dot {
-          background: #F44336;
-        }
-      }
-    }
-  }
-
-  .picker-footer {
-    margin-top: 30rpx;
-    display: flex;
-    justify-content: space-between;
-    padding: 0 20rpx;
-
-    .btn {
-      width: 100%;
-      height: 80rpx;
-      border-radius: 40rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 28rpx;
-
-      &.btn-clear {
-        background: #F8F8F8;
-        color: #999999;
-      }
-
-      &.btn-confirm {
-        background: #C52733;
-        color: #FFFFFF;
-      }
-    }
-  }
-}
-
-@keyframes pulse {
-    0% {
-      opacity: 1;
-      transform: scale(1);
-    }
-    50% {
-      opacity: 0.7;
-      transform: scale(1.05);
-    }
-    100% {
-      opacity: 1;
-      transform: scale(1);
-    }
-  }
-
-  // Animation Styles
-  .calendar-body {
-    position: relative;
-    height: 480rpx; // 6 rows * 80rpx
-    overflow: hidden;
-    width: 100%;
-  }
-
-  .days.absolute {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    // height: 100%; 
-    z-index: 1;
-  }
-
-  // Keyframes for sliding
-  @keyframes slide-next-enter {
-    from { transform: translateX(100%); }
-    to { transform: translateX(0); }
-  }
-  @keyframes slide-next-leave {
-    from { transform: translateX(0); }
-    to { transform: translateX(-100%); }
-  }
-  @keyframes slide-prev-enter {
-    from { transform: translateX(-100%); }
-    to { transform: translateX(0); }
-  }
-  @keyframes slide-prev-leave {
-    from { transform: translateX(0); }
-    to { transform: translateX(100%); }
-  }
-
-  .next-enter { animation: slide-next-enter 0.3s forwards; }
-  .next-leave { animation: slide-next-leave 0.3s forwards; }
-  .prev-enter { animation: slide-prev-enter 0.3s forwards; }
-  .prev-leave { animation: slide-prev-leave 0.3s forwards; }
-</style>

components/OrderGoods.vue

@@ -82,7 +82,7 @@ export default {
   methods: {
     routerGo(cart) {
       this.$yrouter.push({
-        path: "/pagesShop/shop/GoodsEvaluate/index",
+        path: "/pages/shop/GoodsEvaluate/index",
         query: { id: cart.unique }
       });
     }

components/ProductWindow.vue

@@ -1,10 +1,6 @@
 <template>
   <view>
-    <view
+    <view class="product-window" :class="attr.cartAttr === true ? 'on' : ''" :style="{paddingBottom: paddingBottom}">
-      :class="[{ on: attr.cartAttr === true }, className]"
-      :style="{ paddingBottom: paddingBottom }"
-      class="product-window"
-    >
       <view class="textpic acea-row row-between-wrapper">
         <view class="pictrue" @click="previewImg(attrObj.productSelect.image)">
           <image :src="attrObj.productSelect.image" class="image" />
@@ -49,7 +45,7 @@
       </view>
       <view class="cart v12-justify-between v12-align-center">
         <view class="titlev12-dark-text f12-font-32">购买数量</view>
-        <view v-if="!hideQuantityControls" class="carnum acea-row row-left">
+        <view class="carnum acea-row row-left">
           <view style="border-radius: 40rpx  0rpx 0rpx 40rpx" class="cart-btn item reduce  v12-font-36 v12-font-bold v12-white-text v12-dark1 v12-dark1-border" :class="cartNum <= 1 ? 'on' : ''" @click="CartNumDes">-</view>
           <input 
             type="number"
@@ -70,32 +66,25 @@
             @click="CartNumAdd"
           >+</view>
         </view>
-        <view v-else class="v12-font-28 v12-dark-text">x1</view>
       </view>
       <view class="v12-px-2 v12-mt-3" v-if="showOk">
         <u-button 
           shape="circle" 
-          :color="(attr.productSelect.stock === 0 && attr.cartAttr) ? '#9D9D9D' : '#C52733'" 
+          color="#C52733" 
           @click="$emit('ok')"
           :disabled="(attr.productSelect.stock === 0 && attr.cartAttr)"
-        >{{ okText }}</u-button>
+        >加入购物车</u-button>
       </view>
       <view class="v12-px-2 v12-mt-3" v-if="isGift">
         <u-button 
           shape="circle" 
-          :color="(attr.productSelect.stock === 0 && attr.cartAttr) ? '#9D9D9D' : '#C52733'" 
+          color="#C52733" 
           @click="$emit('gift')"
           :disabled="(attr.productSelect.stock === 0 && attr.cartAttr)"
         >送给朋友</u-button>
       </view>
     </view>
-    <view
+    <view class="mask" @touchmove.prevent :hidden="attr.cartAttr === false" @click="closeAttr"></view>
-      :hidden="attr.cartAttr === false"
-      :class="className"
-      class="mask"
-      @touchmove.prevent
-      @click="closeAttr"
-    ></view>
   </view>
 </template>
 <script>
@@ -129,18 +118,6 @@ export default {
     cartNum: {
       type: Number,
       default: () => 1
-    },
-    okText: {
-      type: String,
-      default: '加入购物车'
-    },
-    className: {
-      type: String,
-      default: ''
-    },
-    hideQuantityControls: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
@@ -153,22 +130,12 @@ export default {
     }
   },
   watch: {
-    'attr.cartAttr': {
-      handler(val) {
-        console.log(val);
-        if(!val) {
-          this.cartNumber = 1
-        }
-      },
-      deep: true,
-      immediate: true
-    },
     cartNum: {
       handler(val) {
+        console.log(val, 'cardNum');
         this.cartNumber = val || 1
       },
-      deep: true,
+      deep: true
-      immediate: true
     },
     cartNumber(val) {
       if (val > this.attrObj.productSelect.stock) {
@@ -206,7 +173,7 @@ export default {
       this.$emit("changeFun", { action: "changeattr", value: false })
     },
     CartNumDes() {
-      if(this.cartNumber <= 1) return
+      if(this.cartNumber === 1) return
       console.log(this.cartNumber, 'cartNumber');
       this.cartNumber--
       this.$emit("changeFun", { action: "ChangeCartNum", value: this.cartNumber })
@@ -255,15 +222,6 @@ export default {
 }
 </script>
 <style scope>
-  .btn-car-disabled {
-    border: 2rpx solid #9D9D9D !important;
-    color: #9D9D9D !important;
-  }
-
-  .btn-buy-disabled {
-    background: #9D9D9D !important;
-    color: #FFFFFF !important;
-  }
   .itemn{
     margin: 28rpx 0 0 34rpx !important;
     width: auto;

components/UserEvaluation.vue

@@ -3,74 +3,66 @@
     <view
       v-for="(item, evaluateWtapperIndex) in reply"
       :key="evaluateWtapperIndex"
-      class="evaluateItem v12-pt-3"
+      class="evaluateItem"
     >
-      <!-- 用户信息头部 -->
+      <view class="pic-text acea-row row-middle">
-      <view class="user-header v12-px-4">
+        <view class="pictrue">
-        <view class="avatar-box">
+          <image :src="item.avatar" class="image" />
-          <image :src="item.avatar" class="avatar" mode="aspectFill" />
         </view>
-        <view class="user-info">
+        <view class="acea-row row-middle">
           <view class="name line1">{{ item.nickname }}</view>
-          <view class="time">{{ item.createTime }}</view>
+          <view class="time">{{ item.createTime }} </view>
         </view>
       </view>
       <view class="v12-px-4">
         <view class="v12-secondary-dark-text v12-font-24 attr-bg"> {{ item.sku }}</view>
         <view class="start" :class="'star' + item.star"></view>
       </view>
-
+      <view class="evaluate-infor v12-font-24">{{ item.comment }}</view>
-      <!-- 评论内容 -->
+      <view class="imgList acea-row">
-      <view class="evaluate-infor">{{ item.comment || '此用户没有填写评价'}}</view>
-
-      <!-- 图片/视频列表 -->
-      <view class="imgList">
-        <!-- 视频 -->
         <view v-if="item.video" class="pictrue">
           <view 
             @click="pauseOtherVideo('video' + evaluateWtapperIndex)"  
             v-if="activeVideo !== 'video' + evaluateWtapperIndex" 
             class="play-icon"
-          >
+            >
-            <u-icon name="play-right-fill" color="#fff" size="48"></u-icon>
+              <u-icon name="play-right-fill" color="#fff" size="48"></u-icon>
-          </view>
+            </view>
           <image
             v-if="activeVideo !== 'video' + evaluateWtapperIndex"
             :src="item.video + '?vframe/jpg/offset/1'"
             class="image"
-            mode="aspectFill"
             @click="pauseOtherVideo('video' + evaluateWtapperIndex)"
-          />
+          >
+
+          </image>
           <video
             v-else
             :src="item.video"
             :poster="item.video + '?vframe/jpg/offset/1'"
             controls
             autoplay
-            class="image"
+            play-btn-position="center"
             :id="'video' + evaluateWtapperIndex"
+            class="image"
             @play="pauseOtherVideo('video' + evaluateWtapperIndex)"
           />
         </view>
-        <!-- 图片 -->
         <view
-          v-for="(pic, idx) in item.picturesArr"
+          v-for="(itemn, eq) in item.picturesArr"
-          :key="idx"
+          :key="eq"
           class="pictrue"
         >
-          <image :src="pic" class="image" mode="aspectFill" @click="previewImage(item.picturesArr, idx)" />
+          <image :src="itemn" class="image" @click="previewImage(item.picturesArr, eq)" />
         </view>
       </view>
-
-      <!-- 商家回复 -->
       <view class="reply" v-if="item.merchantReplyContent">
-        <text class="font-color-red">店小二</text>
+        <span class="font-color-red">店小二</span>
         ：{{item.merchantReplyContent}}
       </view>
     </view>
   </view>
 </template>
-
 <script>
 import { dataFormat } from "@/utils";
 
@@ -113,128 +105,28 @@ export default {
   }
 };
 </script>
-
 <style lang="less" scoped>
-.evaluateWtapper {
-  .evaluateItem {
-    margin-bottom: 30rpx;
-    border-bottom: 1px solid #f5f5f5;
-    padding-bottom: 30rpx;
-    &:last-child {
-      border-bottom: none;
-    }
-  }
-}
-
-.user-header {
-  display: flex;
-  align-items: center;
-  margin-bottom: 12rpx;
-  
-  .avatar-box {
-    margin-right: 20rpx;
-    .avatar {
-      width: 70rpx;
-      height: 70rpx;
-      border-radius: 50%;
-    }
-  }
-  
-  .user-info {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    
-    .name {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: bold;
-      margin-bottom: 4rpx;
-    }
-    
-    .time {
-      font-size: 22rpx;
-      color: #999;
-    }
-  }
-}
-
-.tag-row {
-  margin-bottom: 12rpx;
-  .default-tag {
-    display: inline-block;
-    background: #FFF0F1;
-    color: #FE5261;
-    font-size: 20rpx;
-    padding: 4rpx 12rpx;
-    border-radius: 6rpx;
-  }
-}
-
-.star-row {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20rpx;
-  .star-icon {
-    margin-right: 4rpx;
-  }
-}
-
-.evaluate-infor {
-  font-size: 28rpx;
-  color: #333;
-  line-height: 1.6;
-  margin-bottom: 20rpx;
-  text-align: justify;
-}
-
-.imgList {
-  display: flex;
-  flex-wrap: wrap;
-  
-  .pictrue {
-    width: 220rpx;
-    height: 220rpx;
-    margin-right: 15rpx;
-    margin-bottom: 15rpx;
-    border-radius: 12rpx;
-    overflow: hidden;
-    position: relative;
-    background: #f5f5f5;
-    
-    &:nth-child(3n) {
-      margin-right: 0;
-    }
-    
-    .image {
-      width: 100%;
-      height: 100%;
-    }
-    
-    .play-icon {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      z-index: 10;
-    }
-  }
-}
-
-.reply {
-  background: #F5F5F5;
-  border-radius: 12rpx;
-  padding: 20rpx;
-  margin-top: 10rpx;
-  font-size: 24rpx;
-  color: #666;
-  line-height: 1.5;
-}
 .attr-bg{
   background: rgba(197,39,51,0.1);
   padding: 7rpx 5px;
   width: fit-content;
   border-radius: 12rpx;
 }
+.time{
+  padding: 0 !important;
+}
+.evaluateWtapper .evaluateItem .imgList .pictrue{
+  position: relative;
+  width: 300rpx;
+  .play-icon {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    margin: auto;
+    width: 80rpx;
+    height: 80rpx;
+  }
+}
 </style>

components/aiChat/entrance.vue

@@ -13,26 +13,12 @@
 import {
   getAiSystemInfoSetting
 } from '@/api/public'
-import {
-  getCountyAiDetail
-} from '@/api/chat/index'
 export default {
   name: 'AiEntrance',
-  props: {
-    cityName: {
-      type: String,
-      default: ''
-    },
-    countyId: {
-      type: String,
-      default: ''
-    }
-  },
   data() {
     return {
       showImg: false,
-      settingInfo: {},
+      settingInfo: {}
-      localCityName: uni.getStorageSync('locationCityName') || ''
     }
   },
   created() {
@@ -40,19 +26,6 @@ export default {
   },
   methods: {
     init() {
-      if (this.countyId) {
-        getCountyAiDetail({
-          countyId: this.countyId
-        }).then(res => {
-          const { success, data } = res
-          if (success) {
-            const aiImage = data.aiImage || ''
-            this.settingInfo.mainImage = aiImage
-            this.showImg = !!aiImage
-          }
-        })
-        return
-      }
       getAiSystemInfoSetting().then(res => {
         const { success, data } = res
         if (success) {
@@ -63,7 +36,7 @@ export default {
     },
     enterAiChat() {
       uni.navigateTo({
-        url: '/aiChat/views/index?click=1&cityName=' + (this.cityName || this.localCityName) + '&countyId=' + (this.countyId || '')
+        url: '/aiChat/views/index?click=1'
       })
     }
   }

components/cc-comment/cc-comment.vue

@@ -1,485 +0,0 @@
-<template>
-  <view>
-    <view class="c_total">资讯评论</view>
-    <template v-if="dataList && dataList.length">
-      <view class="c_comment" v-for="(item1, index1) in dataList" :key="item1.id">
-        <!-- 一级评论 -->
-        <CommonComp
-          :data="item1"
-          @likeClick="() => likeClick({ item1, index1 })"
-          @replyClick="() => replyClick({ item1, index1 })"
-          @deleteClick="() => deleteClick({ item1, index1 })"
-        />
-        <view class="children_item" v-if="item1.children && item1.children.length">
-          <!-- 二级评论 -->
-          <CommonComp
-            v-for="(item2, index2) in item1.childrenShow"
-            :key="item2.id"
-            :data="item2"
-            :pData="item1"
-            @likeClick="() => likeClick({ item1, index1, item2, index2 })"
-            @replyClick="() => replyClick({ item1, index1, item2, index2 })"
-            @deleteClick="() => deleteClick({ item1, index1, item2, index2 })"
-          />
-          <!-- 展开二级评论 -->
-          <view
-            class="expand_reply"
-            v-if="expandTxtShow({ item1, index1 })"
-            @tap="() => expandReplyFun({ item1, index1 })"
-          >
-            <span class="txt"> 展开{{ item1.children.length - item1.childrenShow.length }}条回复 </span>
-            <uni-icons type="down" size="24" color="#007aff"></uni-icons>
-          </view>
-          <!-- 折叠二级评论 -->
-          <view
-            class="shrink_reply"
-            v-if="shrinkTxtShow({ item1, index1 })"
-            @tap="() => shrinkReplyFun({ item1, index1 })"
-          >
-            <span class="txt"> 收起回复内容 </span>
-            <uni-icons type="up" size="24" color="#007aff"></uni-icons>
-          </view>
-        </view>
-      </view>
-    </template>
-    <!-- 空盒子 -->
-    <view class="empty_box" v-else>
-      <uni-icons type="chatboxes" size="36" color="#c0c0c0"></uni-icons>
-      <view>
-        <span class="txt"> 这里是一片荒草地, </span>
-        <span class="txt click" @click="() => newCommentFun()">说点什么...</span>
-      </view>
-    </view>
-    <!-- 评论弹窗 -->
-    <uni-popup ref="cPopupRef" type="bottom" @change="popChange">
-      <view class="c_popup_box">
-        <view class="reply_text">
-          <template v-if="Object.keys(replyTemp).length">
-            <span class="text_aid">回复给</span>
-            <img
-              class="user_avatar"
-              :src="replyTemp.item2 ? replyTemp.item2.user_avatar : replyTemp.item1.user_avatar"
-            />
-            <span class="text_main">{{ replyTemp.item2 ? replyTemp.item2.user_name : replyTemp.item1.user_name }}</span>
-          </template>
-          <span v-else class="text_main">发表新评论</span>
-        </view>
-        <view class="content">
-          <view class="text_area">
-            <uni-easyinput
-              class="text_area"
-              type="textarea"
-              v-model="commentValue"
-              :placeholder="commentPlaceholder"
-              :focus="focus"
-              trim
-              autoHeight
-              maxlength="300"
-            ></uni-easyinput>
-          </view>
-          <view class="send_btn" @tap="() => sendClick()">发送</view>
-        </view>
-      </view>
-    </uni-popup>
-    <!-- 删除弹窗 -->
-    <uni-popup ref="delPopupRef" type="dialog">
-      <uni-popup-dialog
-        mode="base"
-        title=""
-        content="确定删除这条评论吗?"
-        :before-close="true"
-        @close="delCloseFun"
-        @confirm="delConfirmFun"
-      ></uni-popup-dialog>
-    </uni-popup>
-  </view>
-</template>
-
-<script>
-import CommonComp from "./componets/common";
-export default {
-  components: { CommonComp },
-  props: {
-    /** 登陆用户信息
-     *    id: number // 登陆用户id
-     *    user_name: number // 登陆用户名
-     *    user_avatar: string // 登陆用户头像地址
-     */
-    myInfo: {
-      type: Object,
-      default: () => {},
-    },
-    /** 文章作者信息
-     *    id: number // 文章作者id
-     *    user_name: number // 文章作者名
-     *    user_avatar: string // 文章作者头像地址
-     */
-    userInfo: {
-      type: Object,
-      default: () => {},
-    },
-    /** 评论列表
-     *    id: number // 评论id
-     *    parent_id: number // 父级评论id
-     *    reply_id: number // 被回复人评论id
-     *    reply_name: string // 被回复人名称
-     *    user_name: string // 用户名
-     *    user_avatar: string // 评论者头像地址
-     *    user_content: string // 评论内容
-     *    is_like: boolean // 是否点赞
-     *    like_count: number // 点赞数统计
-     *    create_time: string // 创建时间
-     */
-    tableData: {
-      type: Array,
-      default: () => [],
-    },
-    // 评论总数
-    tableTotal: {
-      type: Number,
-      default: 0,
-    },
-    // 评论删除模式
-    // bind - 当被删除的一级评论存在回复评论, 那么该评论内容变更显示为[当前评论内容已被移除]
-    // only - 仅删除当前评论(后端删除相关联的回复评论, 否则总数显示不对)
-    // all - 删除所有评论包括回复评论
-    deleteMode: {
-      type: String,
-      default: "all",
-    },
-  },
-  data() {
-    return {
-      dataList: [], // 渲染数据(前端的格式)
-      replyTemp: {}, // 回复临时数据
-      isNewComment: false, // 是否为新评论
-      focus: false, // 评论弹窗
-      commentValue: "", // 输入框值
-      commentPlaceholder: "说点什么...", // 输入框占位符
-      delTemp: {}, // 删除临时数据
-    };
-  },
-  watch: {
-    tableData: {
-      handler(newVal) {
-        if (newVal.length !== this.dataList.length) {
-          this.dataList = this.treeTransForm(newVal);
-        }
-      },
-      deep: true,
-      immediate: true,
-    },
-  },
-  mounted() {},
-  methods: {
-    // 数据转换
-    treeTransForm(data) {
-      let newData = JSON.parse(JSON.stringify(data));
-      let result = [];
-      let map = {};
-      newData.forEach((item, i) => {
-        item.owner = item.user_id === this.myInfo.user_id; // 是否为当前登陆用户 可以对自己的评论进行删除 不能回复
-        item.author = item.user_id === this.userInfo.user_id; // 是否为作者 显示标记
-        map[item.id] = item;
-      });
-      newData.forEach((item) => {
-        let parent = map[item.parent_id];
-        if (parent) {
-          (parent.children || (parent.children = [])).push(item); // 所有回复
-          if (parent.children.length === 1) {
-            (parent.childrenShow = []).push(item); // 显示的回复
-          }
-        } else {
-          result.push(item);
-        }
-      });
-      return result;
-    },
-    // 点赞
-    setLike(item) {
-      item.is_like = !item.is_like;
-      item.like_count = item.is_like ? item.like_count + 1 : item.like_count - 1;
-    },
-    likeClick({ item1, index1, item2, index2 }) {
-      let item = item2 || item1;
-      this.setLike(item);
-      this.$emit("likeFun", { params: item }, (res) => {
-        // 请求后端失败, 重置点赞
-        setLike(item);
-      });
-    },
-    // 回复
-    replyClick({ item1, index1, item2, index2 }) {
-      this.replyTemp = JSON.parse(JSON.stringify({ item1, index1, item2, index2 }));
-      this.$refs["cPopupRef"].open();
-    },
-    // 发起新评论
-    newCommentFun() {
-      this.isNewComment = true;
-      this.$refs["cPopupRef"].open();
-    },
-    // 评论弹窗
-    popChange(e) {
-      // 关闭弹窗
-      if (!e.show) {
-        this.commentValue = ""; // 清空输入框值
-        this.replyTemp = {}; // 清空被回复人信息
-        this.isNewComment = false; // 恢复是否为新评论默认值
-      }
-      this.focus = e.show;
-    },
-    // 发送评论
-    sendClick({ item1, index1, item2, index2 } = this.replyTemp) {
-      let item = item2 || item1;
-      let params = {};
-      // 新评论
-      if (this.isNewComment) {
-        params = {
-          id: Math.random(), // 评论id
-          parent_id: null, // 父级评论id
-          reply_id: null, // 被回复评论id
-          reply_name: null, // 被回复人名称
-        };
-      } else {
-        // 回复评论
-        params = {
-          id: Math.random(), // 评论id
-          parent_id: item?.parent_id ?? item.id, // 父级评论id
-          reply_id: item.id, // 被回复评论id
-          reply_name: item.user_name, // 被回复人名称
-        };
-      }
-      params = {
-        ...params,
-        user_id: this.myInfo.user_id, // 用户id
-        user_name: this.myInfo.user_name, // 用户名
-        user_avatar: this.myInfo.user_avatar, // 用户头像地址
-        user_content: this.commentValue, // 用户评论内容
-        is_like: false, // 是否点赞
-        like_count: 0, // 点赞数统计
-        create_time: "刚刚", // 创建时间
-        owner: true, // 是否为所有者 所有者可以进行删除 管理员默认true
-      };
-
-      uni.showLoading({
-        title: "正在发送",
-        mask: true,
-      });
-      this.$emit("replyFun", { params }, (res) => {
-        uni.hideLoading();
-        // 拿到后端返回的id赋值, 因为删除要用到id
-        params = { ...params, id: res.id };
-        // 新评论
-        if (this.isNewComment) {
-          this.dataList.push(params);
-        } else {
-          // 回复
-          let c_data = this.dataList[index1];
-          (c_data.children || (c_data.children = [])).push(params);
-          // 如果已展开所有回复, 那么此时插入children长度会大于childrenShow长度1, 所以就直接展开显示即可
-          if (c_data.children.length === (c_data.childrenShow || (c_data.childrenShow = [])).length + 1) {
-            c_data.childrenShow.push(params);
-          }
-        }
-        this.$emit("update:tableTotal", this.tableTotal + 1);
-        this.$refs["cPopupRef"].close();
-      });
-    },
-    //删除
-    deleteClick({ item1, index1, item2, index2 }) {
-      this.delTemp = JSON.parse(JSON.stringify({ item1, index1, item2, index2 }));
-      this.$refs["delPopupRef"].open();
-    },
-    // 关闭删除弹窗
-    delCloseFun() {
-      this.delTemp = {};
-      this.$refs["delPopupRef"].close();
-    },
-    // 确定删除
-    delConfirmFun({ item1, index1, item2, index2 } = this.delTemp) {
-      const deleteMode = this.deleteMode;
-      let c_data = this.dataList[index1];
-      uni.showLoading({
-        title: "正在删除",
-        mask: true,
-      });
-      // 删除二级评论
-      if (index2 >= 0) {
-        this.$emit("deleteFun", { params: [c_data.children[index2].id], mode: deleteMode }, (res) => {
-          uni.hideLoading();
-          this.$emit("update:tableTotal", this.tableTotal - 1);
-          c_data.children.splice(index2, 1);
-          c_data.childrenShow.splice(index2, 1);
-        });
-      } else {
-        // 删除一级评论
-        if (c_data?.children?.length) {
-          // 如果一级评论包含回复评论
-          switch (deleteMode) {
-            case "bind":
-              // 一级评论内容展示修改为: 当前评论内容已被移除
-              this.$emit(
-                "deleteFun",
-                {
-                  params: [c_data.id],
-                  mode: deleteMode,
-                },
-                (res) => {
-                  uni.hideLoading();
-                  c_data.user_content = "当前评论内容已被移除";
-                }
-              );
-              break;
-            case "only":
-              // 后端自行根据删除的一级评论id, 查找关联的子评论进行删除
-              this.$emit(
-                "deleteFun",
-                {
-                  params: [c_data.id],
-                  mode: deleteMode,
-                },
-                (res) => {
-                  uni.hideLoading();
-                  this.$emit("update:tableTotal", this.tableTotal - c_data.children.length + 1);
-                  this.dataList.splice(index1, 1);
-                }
-              );
-              break;
-            default:
-              // all
-              // 收集子评论id, 提交给后端统一删除
-              let delIdArr = [c_data.id];
-              c_data.children.forEach((_, i) => {
-                delIdArr.push(_.id);
-              });
-              this.$emit("deleteFun", { params: delIdArr, mode: deleteMode }, (res) => {
-                uni.hideLoading();
-                this.$emit("update:tableTotal", this.tableTotal - c_data.children.length + 1);
-                this.dataList.splice(index1, 1);
-              });
-              break;
-          }
-        } else {
-          // 一级评论无回复, 直接删除
-          this.$emit("deleteFun", { params: [c_data.id], mode: deleteMode }, (res) => {
-            uni.hideLoading();
-            this.$emit("update:tableTotal", this.tableTotal - 1);
-            this.dataList.splice(index1, 1);
-          });
-        }
-      }
-      this.delCloseFun();
-    },
-    // 展开评论if
-    expandTxtShow({ item1, index1 }) {
-      return item1.childrenShow?.length && item1.children.length - item1.childrenShow.length;
-    },
-    // 展开更多评论
-    expandReplyFun({ item1, index1 }) {
-      let csLen = this.dataList[index1].childrenShow.length;
-      this.dataList[index1].childrenShow.push(
-        ...this.dataList[index1].children.slice(csLen, csLen + 6) // 截取5条评论
-      );
-    },
-
-    // 收起评论if
-    shrinkTxtShow({ item1, index1 }) {
-      return item1.childrenShow?.length >= 2 && item1.children.length - item1.childrenShow.length === 0;
-    },
-    // 收起更多评论
-    shrinkReplyFun({ item1, index1 }) {
-      this.dataList[index1].childrenShow = [];
-      this.dataList[index1].childrenShow.push(
-        ...this.dataList[index1].children.slice(0, 1) // 截取1条评论
-      );
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-////////////////////////
-.center {
-  display: flex;
-  align-items: center;
-}
-////////////////////////
-.c_total {
-  padding: 20rpx 30rpx 0 30rpx;
-  font-size: 28rpx;
-}
-.empty_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  padding: 150rpx 10rpx;
-  font-size: 28rpx;
-  .txt {
-    color: $uni-text-color-disable;
-  }
-  .click {
-    color: $uni-color-primary;
-  }
-}
-.c_comment {
-  padding: 20rpx 30rpx;
-  font-size: 28rpx;
-
-  .children_item {
-    padding: 20rpx 30rpx;
-    margin-top: 10rpx;
-    margin-left: 80rpx;
-    background-color: $uni-bg-color-grey;
-    .expand_reply,
-    .shrink_reply {
-      margin-top: 10rpx;
-      margin-left: 80rpx;
-      .txt {
-        font-weight: 600;
-        color: $uni-color-primary;
-      }
-    }
-  }
-}
-.c_popup_box {
-  background-color: #fff;
-  .reply_text {
-    @extend .center;
-    padding: 20rpx 20rpx 0 20rpx;
-    font-size: 26rpx;
-    .text_aid {
-      color: $uni-text-color-grey;
-      margin-right: 5rpx;
-    }
-    .user_avatar {
-      width: 48rpx;
-      height: 48rpx;
-      border-radius: 50%;
-      margin-right: 6rpx;
-      margin-left: 12rpx;
-    }
-    .text_main {
-    }
-  }
-  .content {
-    @extend .center;
-    .text_area {
-      flex: 1;
-      padding: 20rpx;
-    }
-    .send_btn {
-      @extend .center;
-      justify-content: center;
-      width: 120rpx;
-      height: 60rpx;
-      border-radius: 20rpx;
-      font-size: 28rpx;
-      color: #fff;
-      background-color: $uni-color-primary;
-      margin-right: 20rpx;
-      margin-left: 5rpx;
-    }
-  }
-}
-</style>

components/cc-comment/componets/common.vue

@@ -1,182 +0,0 @@
-<template>
-  <view class="comment_item">
-    <view class="top">
-      <view class="top_left">
-        <img class="user_avatar" :src="data.user_avatar" />
-        <uni-tag v-if="data.author" class="tag" type="primary" :inverted="false" text="作者" size="mini" circle />
-        <span class="user_name">{{ data.user_name }}</span>
-        <span class="user_name">{{ cReplyName }}</span>
-      </view>
-      <view class="top_right" @click="likeClick(data)">
-        <span :class="[data.is_like ? 'active' : '', 'like_count']">{{ cLikeCount }}</span>
-        <uni-icons v-show="data.is_like" type="hand-up-filled" size="24" color="#007aff"></uni-icons>
-        <uni-icons v-show="!data.is_like" type="hand-up" size="24" color="#999"></uni-icons>
-      </view>
-    </view>
-    <view class="content" @click="replyClick(data)">
-      {{ c_content }}
-      <span class="shrink" v-if="isShrink" @click.stop="expandContentFun(data.user_content)">...展开</span>
-      <span
-        class="shrink"
-        v-if="!isShrink && user_content.length > contentShowLength"
-        @click.stop="shrinkContentFun(data.user_content)"
-      >
-        收起</span
-      >
-    </view>
-    <view class="bottom">
-      <span class="create_time">{{ data.create_time }}</span>
-      <span v-if="data.owner" class="delete" @click="deleteClick(data)">删除</span>
-      <!-- <span v-else class="reply" @click="replyClick(props.data)"
-          >回复</span
-        > -->
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  props: {
-    // 评论数据
-    data: {
-      type: Object,
-      default: () => {},
-    },
-  },
-  data() {
-    return {
-      // 评论过长处理
-      contentShowLength: 70, // 默认显示评论字符
-      user_content: "",
-      isShrink: false, // 是否收缩评论
-      c_content: "",
-    };
-  },
-  computed: {
-    // 被回复人名称
-    cReplyName: function () {
-      return this.data?.reply_name ? ` ▸ ` + this.data?.reply_name : "";
-    },
-    // 点赞数显示
-    cLikeCount: function () {
-      return this.data.like_count === 0 ? "" : this.$formatCount(this.data.like_count);
-    },
-  },
-  watch: {
-    // 删除变更显示定制
-    "data.user_content": function (newVal, oldVal) {
-      if (newVal !== oldVal) {
-        this.c_content = newVal;
-      }
-    },
-    // 监听isShrink变化，更新c_content
-    isShrink: function (newVal) {
-      this.c_content = newVal ? this.user_content.slice(0, this.contentShowLength + 1) : this.user_content;
-    },
-  },
-  methods: {
-    // 展开文字
-    expandContentFun() {
-      this.isShrink = false;
-    },
-    // 收起文字
-    shrinkContentFun() {
-      this.isShrink = true;
-    },
-    // 点赞
-    likeClick(item) {
-      this.$emit("likeClick", item);
-    },
-    // 回复
-    replyClick(item) {
-      // 自己不能回复自己
-      if (item.owner) return;
-      this.$emit("replyClick", item);
-    },
-    // 删除
-    deleteClick(item) {
-      this.$emit("deleteClick", item);
-    },
-  },
-  mounted() {
-    this.user_content = this.data.user_content;
-    this.isShrink = this.user_content.length > this.contentShowLength;
-    this.c_content = this.isShrink ? this.user_content.slice(0, this.contentShowLength + 1) : this.user_content;
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-////////////////////
-.center {
-  display: flex;
-  align-items: center;
-}
-.ellipsis {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-////////////////////
-.comment_item {
-  font-size: 28rpx;
-  .top {
-    @extend .center;
-    justify-content: space-between;
-    .top_left {
-      display: flex;
-      align-items: center;
-      overflow: hidden;
-      .user_avatar {
-        width: 68rpx;
-        height: 68rpx;
-        border-radius: 50%;
-        margin-right: 12rpx;
-      }
-      .tag {
-        margin-right: 6rpx;
-      }
-      .user_name {
-        @extend .ellipsis;
-        max-width: 180rpx;
-        color: #8c8c8c;
-      }
-    }
-    .top_right {
-      @extend .center;
-      .like_count {
-        color: #8c8c8c;
-        &.active {
-          color: #007aff;
-        }
-      }
-    }
-  }
-  .content {
-    padding: 10rpx;
-    margin-left: 70rpx;
-    color: #333;
-    &:active {
-      background-color: #f2f2f2;
-    }
-    .shrink {
-      padding: 20rpx 20rpx 20rpx 0rpx;
-      color: #007aff;
-    }
-  }
-  .bottom {
-    padding-left: 80rpx;
-    font-size: 24rpx;
-    .create_time {
-      color: #8c8c8c;
-    }
-    .delete {
-      padding: 20rpx 20rpx 0 20rpx;
-      color: #c0c0c0;
-    }
-    .reply {
-      color: #007aff;
-    }
-  }
-}
-</style>

components/easy-upload/easy-upload.vue

@@ -0,0 +1,343 @@
+<template>
+	<view>
+		<view class="upload">
+			<block v-for="(upload,index) in uploads" :key="index">
+				<view class="uplode-file">
+					<image v-if="types == 'image'" class="uploade-img" :style="'width:' + upload_img_wh + 'rpx; height:' + upload_img_wh + 'rpx;'" :src="upload" :data-src="upload" @tap="previewImage"></image>
+					<image v-if="types == 'image'" class="clear-one-icon" :src="clearIcon" @tap="delImage(index)"></image>
+					<video v-if="types == 'video'" class="uploade-img" :style="'width:' + upload_img_wh + 'rpx; height:' + upload_img_wh + 'rpx;'" :src="upload" controls>
+						<cover-image v-if="types == 'video'" class="clear-one-icon" :src="clearIcon" @tap="delImage(index)"></cover-image>
+					</video>
+				</view>
+			</block>
+			<view v-if="uploads.length < uploadCount" :class="uploadIcon ? 'uploader-icon' : 'uploader-input-box'" :style="'width:' + upload_img_wh + 'rpx; height:' + upload_img_wh + 'rpx;'" >
+				<view v-if="!uploadIcon" class="uploader-input" @tap="chooseUploads"></view>
+				<image v-else class="image-cion"  :src="uploadIcon" @tap="chooseUploads"></image>
+			</view>
+		</view>	
+		<!-- <button type="primary" v-if="types == 'image' && !autoUpload" @tap="unifiedUpload">上传</button> -->
+	</view>
+</template>
+
+<script>
+	export default{
+		props: {
+			header:{
+				type:Object,
+				default:{}
+			},
+			types: {
+				type: String,
+				default: 'image'
+			},
+			dataList: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			clearIcon: {
+				type: String,
+				default: 'http://img1.imgtn.bdimg.com/it/u=451604666,2295832001&fm=26&gp=0.jpg'
+			},
+			uploadIcon: {
+				type: String,
+				default: ''
+			},
+			uploadUrl: {
+				type: String,
+				default: ''
+			},
+			deleteUrl: {
+				type: String,
+				default: ''
+			},
+			uploadCount: {
+				type: Number,
+				default: 1
+			},
+			//上传图片大小 默认3M
+			upload_max: {
+				type: Number,
+				default: 3
+			},
+			//上传视频大小 默认30M
+			upload_video_max: {
+				type: Number,
+				default: 50
+			},
+			// 图片/选择宽高
+			upload_img_wh: {
+				type: Number,
+				default: 210
+			},
+			autoUpload: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data(){
+			return {
+				//上传的图片地址
+				uploadImages: [],
+				//展示的图片地址
+				uploads: [],
+				// 超出限制数组
+				exceeded_list: [],
+			}
+		},
+		watch:{
+			dataList:{
+				handler(val){
+					this.uploads = val;
+				},
+				immediate: true
+			}
+		},
+		methods:{
+			previewImage (e) {
+				var current = e.target.dataset.src
+				uni.previewImage({
+					current: current,
+					urls: this.dataList
+				})
+			},
+			chooseUploads(){
+				switch (this.types){
+					case 'image': 
+						uni.chooseImage({
+							count: this.uploadCount - this.uploads.length, //默认9
+							sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+							sourceType: ['album', 'camera'], //从相册选择
+							success: (res) => {
+								for(let i = 0; i< res.tempFiles.length; i++){
+									if(Math.ceil(res.tempFiles[i].size / 1024) < this.upload_max * 1024){
+										this.uploads.push(res.tempFiles[i].path)
+										console.log(this.uploads);
+										if(this.autoUpload){
+											this.uploadFile(res.tempFiles[i].path)
+										}else{
+											this.uploadImages.push(res.tempFiles[i].path);
+										}
+									}else {
+										this.exceeded_list.push(i === 0 ? 1 : i + 1);
+										uni.showModal({
+											title: '提示',
+											content: `第${[...new Set(this.exceeded_list)].join(',')}张图片超出限制${this.upload_max}MB,已过滤`
+										});
+									}
+								}
+							},
+							fail: (err) => {
+								uni.showModal({
+									content: JSON.stringify(err)
+								});
+							}
+						});
+					break;
+					case 'video' :
+						uni.chooseVideo({
+							sourceType: ['camera', 'album'],
+							success: (res) => {
+								if(Math.ceil(res.size / 1024) < this.upload_video_max * 1024){
+									this.uploads.push(res.tempFilePath)
+									uni.uploadFile({
+										url: this.uploadUrl, //仅为示例，非真实的接口地址
+										filePath: res.tempFilePath,
+										name: 'file',
+										//请求参数
+										formData: {
+											'user': 'test'
+										},
+										success: (uploadFileRes) => {
+											this.$emit('successVideo',uploadFileRes)
+										}
+									});
+								}else {
+									uni.showModal({
+										title: '提示',
+										content: `第${[...new Set(this.exceeded_list)].join(',')}张视频超出限制${this.upload_max}MB,已过滤`
+									});
+								}
+							},
+							fail: (err) => {
+								uni.showModal({
+									content: JSON.stringify(err)
+								});
+							}
+						});
+					break;
+				}
+			},
+			delImage(index){
+				
+				this.uploads.splice(index,1)
+				//如果不自动上传
+				if(!this.autoUpload){
+					this.uploadImages.splice(index,1)
+				}
+				
+				// //第一个是判断app或者h5的 第二个是判断小程序的
+				// if(this.uploads[index].substring(0,4) !== 'http' || this.uploads[index].substring(0,11) == 'http://tmp/'){
+				// 	this.uploads.splice(index,1)
+				// 	//如果不自动上传
+				// 	if(!this.autoUpload){
+				// 		this.uploadImages.splice(index,1)
+				// 	}
+				// 	return;
+				// };
+				
+				// if(!this.deleteUrl) {
+				// 	uni.showModal({
+				// 		content: '请填写删除接口'
+				// 	});
+				// 	return;
+				// };
+				// uni.request({
+				// 	url: this.deleteUrl,
+				// 	method: 'DELETE',
+				// 	data: {
+				// 		image: this.dataList[index]
+				// 	},
+				// 	success: res => {
+				// 		if(res.data.status == 1) {
+				// 			uni.showToast({
+				// 				title: '删除成功'
+				// 			})
+				// 			this.uploads.splice(index,1)
+				// 		}
+				// 	},
+				// });
+			},
+			uploadFile(path){
+				// uni.uploadFile({
+				// 	url: this.uploadUrl, //仅为示例，非真实的接口地址
+				// 	filePath: path,
+				// 	name: 'file',
+				// 	//自定义请求参数
+				// 	formData: {
+				// 		'user': 'test'
+				// 	},
+				// 	success: (uploadFileRes) => {
+				// 		this.$emit('successImage',uploadFileRes)
+				// 	}
+				// });
+				
+				uni.uploadFile({
+					url: this.uploadUrl,
+					filePath: path,
+					header: this.header,
+					name: "file",
+					success: res => {
+						console.log(res);
+						
+						this.$emit('successImage',uploadFileRes)
+					},
+					fail: err => {
+						
+						console.log(err);
+						
+					},
+					complete: res => {
+						
+					}
+				});
+			},
+			unifiedUpload(){
+				if(!this.uploadUrl) {
+					uni.showModal({
+						content: '请填写上传接口'
+					});
+					return;
+				};
+				for (let i of this.uploadImages) {
+					this.uploadFile(i)
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.upload {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+	.uplode-file {
+		margin: 10rpx;
+		/* width: 210upx;
+		height: 210upx; */
+		position: relative;
+	}
+	.uploade-img {
+		display: block;
+		/* width: 210upx;
+		height: 210upx; */
+	}
+	.clear-one{
+		position: absolute;
+		top: -10rpx;
+		right: 0;
+	}
+	.clear-one-icon{
+		position: absolute;
+		width: 20px;
+		height: 20px;
+		top: 0;
+		right: 0;
+		z-index: 9;
+	}
+	.uploader-input-box {
+		position: relative;
+		margin:10upx;
+		/* width: 208upx;
+		height: 208upx; */
+		border: 2upx solid #D9D9D9;
+		box-sizing: border-box;
+	}
+	.uploader-input-box:before,
+	.uploader-input-box:after {
+		content: " ";
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		-webkit-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		background-color: #D9D9D9;
+	}
+	.uploader-input-box:before {
+		width: 4upx;
+		height: 79upx;
+	}
+	.uploader-input-box:after {
+		width: 79upx;
+		height: 4upx;
+	}
+	.uploader-input-box:active {
+		border-color: #999999;
+	}
+	.uploader-input-box:active:before,
+	.uploader-input-box:active:after {
+		background-color: #999999;
+	}
+	.uploader-input {
+		position: absolute;
+		z-index: 1;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		opacity: 0;
+	}
+	.uploader-icon{
+		position: relative;
+		margin:10upx;
+		/* width: 208upx;
+		height: 208upx; */
+	}
+	.uploader-icon .image-cion{
+		width: 100%;
+		height: 100%;
+	}
+</style>

components/easy-upload/readme.md

@@ -0,0 +1,51 @@
+### easy-upload 组件
+
+使用方法
+```js
+	<easy-upload
+		:dataList="dataList" 
+		uploadUrl="http://localhost:3000/upload" 
+		deleteUrl='http://localhost:3000/upload' 
+		:types="types"
+		@successImage="successImage" 
+		@successVideo="successvideo"
+	/>
+
+	//使用 hbuilderX (easycom) 可以直接使用 或
+	import easyUpload from '@/components/easy-upload/easy-upload.vue'
+	export default {
+		//用easycom 则省略注册组件
+		components:{
+			easyUpload
+		},
+		data() {
+			return {
+				dataList: [],
+				types: 'image'
+			}
+		}
+	}	
+```
+
+|  参数   | 类型  | 是否必填 | 参数描述
+|  ----  | ----  | ---- | ----
+| types  | String | 否 | 上传类型 image/video
+| autoUpload  | Boolean | 否 | 自动上传 默认false
+| dataList  | Array | 否 | 图片/视频数据展示
+| clearIcon  | String | 否 | 删除图标(可以换成自己的图片)
+| uploadIcon  | String | 否 | 上传图标(可以换成自己的图片)
+| uploadUrl  | String | 否 | 上传的接口
+| deleteUrl  | String | 否 | 删除的接口
+| uploadCount  | Number | 否 | 上传图片最大个数(默认为一张)
+| upload_max  | Number | 否 | 上传大小(默认为3M)
+| upload_max  | Number | 否 | 上传大小(默认为3M)
+| upload_max  | Number | 否 | 上传大小(默认为3M)
+
+|  事件  | 是否必填 | 参数描述
+|  ---- | ---- | ----
+| successImage  | 否 | 上传图片成功事件
+| successVideo  |  否 | 上传视频成功回调
+
+示例项目中有简单的服务端代码 /server (node.js)
+如果本地测试可以先运行一下服务端的代码 
+

components/sharePopup.vue

@@ -1,128 +0,0 @@
-<template>
-  <u-popup
-    :show="showShare"
-    mode="center"
-    bgColor="transparent"
-    closeable
-    @close="closeShare"
-  >
-    <view class="box-share">
-      <view class="box-img">
-        <image :src="posterUrl" class="main-img" mode="widthFix" />
-      </view>
-      <image
-        :src="webUrl + '/20230608112210135038.png'"
-        mode="widthFix"
-        class="btn"
-        @click="saveImg"
-      />
-    </view>
-  </u-popup>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      posterUrl: '',
-      showShare: false
-    }
-  },
-  methods: {
-    closeShare() {
-      this.showShare = false
-    },
-    showView(url) {
-      this.posterUrl = url
-      this.showShare = true
-    },
-    saveImg() {
-      const _this = this
-      uni.getSetting({
-        success: getRes => {
-          if (getRes.authSetting["scope.writePhotosAlbum"]) {
-            _this.downloadImage()
-          } else {
-            uni.authorize({
-              scope: "scope.writePhotosAlbum",
-              success: () => {
-                _this.downloadImage()
-              },
-              fail: () => {
-                uni.openSetting({
-                  success: openRes => {
-                    console.log(typeof openRes, openRes)
-                  },
-                  fail: () => {
-                    uni.showToast({
-                      title: "请在设置中打开对应权限",
-                      icon: "none"
-                    })
-                  }
-                })
-              }
-            })
-          }
-        },
-        fail: (err) => {
-          console.log(err, 2)
-        }
-      })
-    },
-    downloadImage() {
-      const _this = this
-      const randomID = () => Math.random().toString(36).substring(2)
-      uni.downloadFile({
-        url: this.posterUrl, // 网络图片的地址
-        filePath: wx.env.USER_DATA_PATH + "/share_" + randomID() + ".png",  // 指定的本地文件路径
-        success: downRes => {
-          uni.saveImageToPhotosAlbum({
-            filePath: downRes.filePath, // 临时文件地址
-            success: function () {
-              uni.showToast({
-                title: "保存成功",
-                icon: "success",
-                success() {
-                  _this.showShare = false
-                }
-              })
-            },
-            fail: function (err) {
-              uni.showToast({
-                title: err,
-                icon: "none"
-              })
-            }
-          })
-        },
-        fail: function (err) {
-          uni.showToast({
-            title: err.errMsg,
-            icon: "error"
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.box-share {
-  width: 600rpx;
-  border-radius: 20rpx;
-  overflow: hidden;
-}
-.box-img {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.btn {
-  width: 100%;
-  height: 80rpx;
-  line-height: 80rpx;
-  margin-top: 40rpx;
-}
-</style>

components/simple-address/city-data/province.js

@@ -0,0 +1,143 @@
+/* eslint-disable */
+var provinceData = [{
+    "label": "北京市",
+    "value": "11"
+  },
+  {
+    "label": "天津市",
+    "value": "12"
+  },
+  {
+    "label": "河北省",
+    "value": "13"
+  },
+  {
+    "label": "山西省",
+    "value": "14"
+  },
+  {
+    "label": "内蒙古自治区",
+    "value": "15"
+  },
+  {
+    "label": "辽宁省",
+    "value": "21"
+  },
+  {
+    "label": "吉林省",
+    "value": "22"
+  },
+  {
+    "label": "黑龙江省",
+    "value": "23"
+  },
+  {
+    "label": "上海市",
+    "value": "31"
+  },
+  {
+    "label": "江苏省",
+    "value": "32"
+  },
+  {
+    "label": "浙江省",
+    "value": "33"
+  },
+  {
+    "label": "安徽省",
+    "value": "34"
+  },
+  {
+    "label": "福建省",
+    "value": "35"
+  },
+  {
+    "label": "江西省",
+    "value": "36"
+  },
+  {
+    "label": "山东省",
+    "value": "37"
+  },
+  {
+    "label": "河南省",
+    "value": "41"
+  },
+  {
+    "label": "湖北省",
+    "value": "42"
+  },
+  {
+    "label": "湖南省",
+    "value": "43"
+  },
+  {
+    "label": "广东省",
+    "value": "44"
+  },
+  {
+    "label": "广西壮族自治区",
+    "value": "45"
+  },
+  {
+    "label": "海南省",
+    "value": "46"
+  },
+  {
+    "label": "重庆市",
+    "value": "50"
+  },
+  {
+    "label": "四川省",
+    "value": "51"
+  },
+  {
+    "label": "贵州省",
+    "value": "52"
+  },
+  {
+    "label": "云南省",
+    "value": "53"
+  },
+  {
+    "label": "西藏自治区",
+    "value": "54"
+  },
+  {
+    "label": "陕西省",
+    "value": "61"
+  },
+  {
+    "label": "甘肃省",
+    "value": "62"
+  },
+  {
+    "label": "青海省",
+    "value": "63"
+  },
+  {
+    "label": "宁夏回族自治区",
+    "value": "64"
+  },
+  {
+    "label": "新疆维吾尔自治区",
+    "value": "65"
+  },
+  {
+    "label": "台湾",
+    "value": "66"
+  },
+  {
+    "label": "香港",
+    "value": "67"
+  },
+  {
+    "label": "澳门",
+    "value": "68"
+  },
+  {
+    "label": "钓鱼岛",
+    "value": "69"
+  }
+]
+export default provinceData;

components/simple-address/simple-address.nvue

@@ -0,0 +1,381 @@
+<template>
+	<view class="simple-address" v-if="showPopup" @touchmove.stop.prevent="clear">
+		<!-- 遮罩层 -->
+		<view
+			class="simple-address-mask"
+			@touchmove.stop.prevent="clear"
+			v-if="maskClick"
+			:class="[ani + '-mask', animation ? 'mask-ani' : '']"
+			:style="{
+				'background-color': maskBgColor
+			}"
+			@tap="hideMask(true)"
+		></view>
+
+		<view class="simple-address-content simple-address--fixed" :class="[type, ani + '-content', animation ? 'content-ani' : '']">
+			<view class="simple-address__header">
+				<view class="simple-address__header-btn-box" @click="pickerCancel"><text class="simple-address__header-text">取消</text></view>
+				<view class="simple-address__header-btn-box" @click="pickerConfirm"><text class="simple-address__header-text" :style="{ color: themeColor }">确定</text></view>
+			</view>
+			<view class="simple-address__box">
+				<picker-view indicator-style="height: 70rpx;" class="simple-address-view" :value="pickerValue" @change="pickerChange">
+					<picker-view-column>
+						<!-- #ifndef APP-NVUE -->
+						<view class="picker-item" v-for="(item, index) in provinceDataList" :key="index">{{ item.label }}</view>
+						<!-- #endif -->
+						<!-- #ifdef APP-NVUE -->
+						<text class="picker-item" v-for="(item, index) in provinceDataList" :key="index">{{ item.label }}</text>
+						<!-- #endif -->
+					</picker-view-column>
+					<picker-view-column>
+						<!-- #ifndef APP-NVUE -->
+						<view class="picker-item" v-for="(item, index) in cityDataList" :key="index">{{ item.label }}</view>
+						<!-- #endif -->
+						<!-- #ifdef APP-NVUE -->
+						<text class="picker-item" v-for="(item, index) in cityDataList" :key="index">{{ item.label }}</text>
+						<!-- #endif -->
+					</picker-view-column>
+					<picker-view-column>
+						<!-- #ifndef APP-NVUE -->
+						<view class="picker-item" v-for="(item, index) in areaDataList" :key="index">{{ item.label }}</view>
+						<!-- #endif -->
+						<!-- #ifdef APP-NVUE -->
+						<text class="picker-item" v-for="(item, index) in areaDataList" :key="index">{{ item.label }}</text>
+						<!-- #endif -->
+					</picker-view-column>
+				</picker-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import provinceData from './city-data/province.js';
+import cityData from './city-data/city.js';
+import areaData from './city-data/area.js';
+export default {
+	name: 'simpleAddress',
+	props: {
+		mode: {
+			// 地址类型
+			// default 则代表老版本根据index索引获取数据
+			//
+			type: String,
+			default: 'default'
+		},
+		// 开启动画
+		animation: {
+			type: Boolean,
+			default: true
+		},
+		/* 弹出层类型，可选值；
+				bottom：底部弹出层
+			*/
+		type: {
+			type: String,
+			default: 'bottom'
+		},
+		// maskClick
+		maskClick: {
+			type: Boolean,
+			default: true
+		},
+		show: {
+			type: Boolean,
+			default: true
+		},
+		maskBgColor: {
+			type: String,
+			default: 'rgba(0, 0, 0, 0.4)' //背景颜色 rgba(0, 0, 0, 0.4) 为空则调用 uni.scss
+		},
+		themeColor: {
+			type: String,
+			default: '' // 主题色
+		},
+		/* 默认值 */
+		pickerValueDefault: {
+			type: Array,
+			default() {
+				return [0, 0, 0];
+			}
+		}
+	},
+	data() {
+		return {
+			ani: '',
+			showPopup: false,
+			pickerValue: [0, 0, 0],
+			provinceDataList: [],
+			cityDataList: [],
+			areaDataList: []
+		};
+	},
+	watch: {
+		show(newValue) {
+			if (newValue) {
+				this.open();
+			} else {
+				this.close();
+			}
+		},
+		pickerValueDefault() {
+			this.init();
+		}
+	},
+	created() {
+		this.init();
+	},
+	methods: {
+		init() {
+			this.handPickValueDefault(); // 对 pickerValueDefault 做兼容处理
+			this.provinceDataList = provinceData;
+			this.cityDataList = cityData[this.pickerValueDefault[0]];
+			this.areaDataList = areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]];
+			this.pickerValue = this.pickerValueDefault;
+		},
+		handPickValueDefault() {
+			if (this.pickerValueDefault !== [0, 0, 0]) {
+				if (this.pickerValueDefault[0] > provinceData.length - 1) {
+					this.pickerValueDefault[0] = provinceData.length - 1;
+				}
+				if (this.pickerValueDefault[1] > cityData[this.pickerValueDefault[0]].length - 1) {
+					this.pickerValueDefault[1] = cityData[this.pickerValueDefault[0]].length - 1;
+				}
+				if (this.pickerValueDefault[2] > areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]].length - 1) {
+					this.pickerValueDefault[2] = areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]].length - 1;
+				}
+			}
+		},
+		pickerChange(e) {
+			let changePickerValue = e.detail.value;
+			if (this.pickerValue[0] !== changePickerValue[0]) {
+				// 第一级发生滚动
+				this.cityDataList = cityData[changePickerValue[0]];
+				this.areaDataList = areaData[changePickerValue[0]][0];
+				changePickerValue[1] = 0;
+				changePickerValue[2] = 0;
+			} else if (this.pickerValue[1] !== changePickerValue[1]) {
+				// 第二级滚动
+				this.areaDataList = areaData[changePickerValue[0]][changePickerValue[1]];
+				changePickerValue[2] = 0;
+			}
+			this.pickerValue = changePickerValue;
+			this._$emit('onChange');
+		},
+		_$emit(emitName) {
+			let pickObj = {
+				label: this._getLabel(),
+				value: this.pickerValue,
+				cityCode: this._getCityCode(),
+				areaCode: this._getAreaCode(),
+				provinceCode: this._getProvinceCode(),
+				labelArr:this._getLabel().split('-')
+			};
+			console.log(this._getLabel().split('-'));
+			this.$emit(emitName, pickObj);
+		},
+		_getLabel() {
+			let pcikerLabel =
+				this.provinceDataList[this.pickerValue[0]].label + '-' + this.cityDataList[this.pickerValue[1]].label + '-' + this.areaDataList[this.pickerValue[2]].label;
+			return pcikerLabel;
+		},
+		_getCityCode() {
+			return this.cityDataList[this.pickerValue[1]].value;
+		},
+		_getProvinceCode() {
+			return this.provinceDataList[this.pickerValue[0]].value;
+		},
+		_getAreaCode() {
+			return this.areaDataList[this.pickerValue[2]].value;
+		},
+		queryIndex(params = [], type = 'value') {
+			// params = [ 11 ,1101,110101 ];
+			// 1.获取省份的index
+			let provinceIndex = provinceData.findIndex(res => res[type] == params[0]);
+			let cityIndex = cityData[provinceIndex].findIndex(res => res[type] == params[1]);
+			let areaIndex = areaData[provinceIndex][cityIndex].findIndex(res => res[type] == params[2]);
+			return {
+				index: [provinceIndex, cityIndex, areaIndex],
+				data: {
+					province: provinceData[provinceIndex],
+					city: cityData[provinceIndex][cityIndex],
+					area: areaData[cityIndex][0][areaIndex]
+				}
+			};
+		},
+		clear() {},
+		hideMask() {
+			this._$emit('onCancel');
+			this.close();
+		},
+		pickerCancel() {
+			this._$emit('onCancel');
+			this.close();
+		},
+		pickerConfirm() {
+			this._$emit('onConfirm');
+			this.close();
+		},
+		open() {
+			this.showPopup = true;
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.ani = 'simple-' + this.type;
+				}, 100);
+			});
+		},
+		close(type) {
+			if (!this.maskClick && type) return;
+			this.ani = '';
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.showPopup = false;
+				}, 300);
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.simple-address {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+.simple-address-mask {
+	position: fixed;
+	bottom: 0;
+	top: 0;
+	left: 0;
+	right: 0;
+
+	transition-property: opacity;
+	transition-duration: 0.3s;
+	opacity: 0;
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+}
+
+.mask-ani {
+	transition-property: opacity;
+	transition-duration: 0.2s;
+}
+
+.simple-bottom-mask {
+	opacity: 1;
+}
+
+.simple-center-mask {
+	opacity: 1;
+}
+
+.simple-address--fixed {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	transition-property: transform;
+	transition-duration: 0.3s;
+	transform: translateY(460rpx);
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+}
+
+.simple-address-content {
+	background-color: #ffffff;
+}
+
+.simple-content-bottom {
+	bottom: 0;
+	left: 0;
+	right: 0;
+	transform: translateY(500rpx);
+}
+
+.content-ani {
+	transition-property: transform, opacity;
+	transition-duration: 0.2s;
+}
+
+.simple-bottom-content {
+	transform: translateY(0);
+}
+
+.simple-center-content {
+	transform: scale(1);
+	opacity: 1;
+}
+
+.simple-address__header {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	flex-wrap: nowrap;
+	justify-content: space-between;
+	border-bottom-color: #f2f2f2;
+	border-bottom-style: solid;
+	border-bottom-width: 1rpx;
+}
+
+.simple-address--fixed-top {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	border-top-color: $uni-border-color;
+	border-top-style: solid;
+	border-top-width: 1rpx;
+}
+
+.simple-address__header-btn-box {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	height: 70rpx;
+}
+
+.simple-address__header-text {
+	text-align: center;
+	font-size: $uni-font-size-base;
+	color: #1aad19;
+	line-height: 70rpx;
+	padding-left: 40rpx;
+	padding-right: 40rpx;
+}
+
+.simple-address__box {
+	position: relative;
+}
+
+.simple-address-view {
+	position: relative;
+	bottom: 0;
+	left: 0;
+	/* #ifndef APP-NVUE */
+	width: 100%;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	width: 750rpx;
+	/* #endif */
+	height: 408rpx;
+	background-color: rgba(255, 255, 255, 1);
+}
+
+.picker-item {
+	text-align: center;
+	line-height: 70rpx;
+	text-overflow: ellipsis;
+	font-size: 28rpx;
+}
+</style>

components/tpf-time-range/tpf-time-range.vue

@@ -1,5 +1,5 @@
 <template>
-	<u-popup :closeOnClickOverlay="true" :show="show" ref="popup" type="bottom">
+	<uni-popup ref="popup" type="bottom">
 		<view class="tpf-time-range-section">
 			<view class="tpf-time-range-title-section flex flex-align-center flex-pack-justify">
 				<text class="tpf-time-range-title-txt tpf-time-range-cancel" @tap="closePopup('cancel')">取消</text>
@@ -30,7 +30,7 @@
 				</view>
 			</view>
 		</view>
-	</u-popup>
+	</uni-popup>
 </template>
 
 <script>
@@ -98,7 +98,6 @@ export default{
 		return {
 			startDefaultTimeArr:[0,0],
 			endDefaultTimeArr:[0,0],
-			show: false
 		}
 	},
 	methods:{
@@ -111,11 +110,11 @@ export default{
 			if(this.compareTwoTimeRange(this.startDefaultTimeArr,e.detail.value)) this.startDefaultTimeArr = e.detail.value;
 		},
 		open(){
-			this.show = true;
+			this.$refs.popup.open();
 		},
 		closePopup(action=""){
 			if(action == "cancel"){
-				this.show = false;
+				this.$refs.popup.close();
 				return false;
 			}
 			if(this.compareTwoTimeRange(this.startDefaultTimeArr , this.endDefaultTimeArr)){
@@ -130,7 +129,7 @@ export default{
 			this.$emit('timeRange',[
 				startTime,endTime
 			]);
-			this.show = false;
+			this.$refs.popup.close();
 		},
 		compareTwoTimeRange(arr1=[],arr2=[]){
 			if(arr1[0]>arr2[0] || (arr1[0] == arr2[0] && arr1[1] > arr2[1])) return true;

components/uni-segmented-control/uni-segmented-control.vue

@@ -0,0 +1,134 @@
+<template>
+	<view :class="[styleType === 'text'?'segmented-control--text' : 'segmented-control--button' ]" :style="{ borderColor: styleType === 'text' ? '' : activeColor }"
+	 class="segmented-control">
+		<view v-for="(item, index) in values" :class="[ styleType === 'text'?'segmented-control__item--text': 'segmented-control__item--button' , index === currentIndex&&styleType === 'button'?'segmented-control__item--button--active': '' , index === 0&&styleType === 'button'?'segmented-control__item--button--first': '',index === values.length - 1&&styleType === 'button'?'segmented-control__item--button--last': '' ]"
+		 :key="index" :style="{
+        backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : '',borderColor: index === currentIndex&&styleType === 'text'||styleType === 'button'?activeColor:'transparent'
+      }"
+		 class="segmented-control__item" @click="_onClick(index)">
+			<text :style="{color:
+          index === currentIndex
+            ? styleType === 'text'
+              ? activeColor
+              : '#fff'
+            : styleType === 'text'
+              ? '#000'
+              : activeColor}"
+			 class="segmented-control__text">{{ item }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SegmentedControl 分段器
+	 * @description 用作不同视图的显示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=54
+	 * @property {Number} current 当前选中的tab索引值，从0计数
+	 * @property {String} styleType = [button|text] 分段器样式类型
+	 * 	@value button 按钮类型
+	 * 	@value text 文字类型
+	 * @property {String} activeColor 选中的标签背景色与边框颜色
+	 * @property {Array} values 选项数组
+	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+	 */
+	export default {
+		name: 'UniSegmentedControl',
+		props: {
+			current: {
+				type: Number,
+				default: 0
+			},
+			values: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			activeColor: {
+				type: String,
+				default: '#007aff'
+			},
+			styleType: {
+				type: String,
+				default: 'button'
+			}
+		},
+		data() {
+			return {
+				currentIndex: 0
+			}
+		},
+		watch: {
+			current(val) {
+				if (val !== this.currentIndex) {
+					this.currentIndex = val
+				}
+			}
+		},
+		created() {
+			this.currentIndex = this.current
+		},
+		methods: {
+			_onClick(index) {
+				if (this.currentIndex !== index) {
+					this.currentIndex = index
+					this.$emit('clickItem', {
+						currentIndex: index
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.segmented-control {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		height: 50rpx;
+		overflow: hidden;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+	.segmented-control__item {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		box-sizing: border-box;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		justify-content: center;
+		align-items: center;
+		padding: 10rpx;
+	}
+	.segmented-control__item--button {
+		border-style: solid;
+		border-top-width: 1px;
+		border-bottom-width: 1px;
+		border-right-width: 1px;
+		border-left-width: 0;
+	}
+	.segmented-control__item--button--first {
+		border-left-width: 1px;
+		border-top-left-radius: 5px;
+		border-bottom-left-radius: 5px;
+	}
+	.segmented-control__item--button--last {
+		border-top-right-radius: 5px;
+		border-bottom-right-radius: 5px;
+	}
+	.segmented-control__item--text {
+		border-bottom-style: solid;
+		border-bottom-width: 3px;
+	}
+	.segmented-control__text {
+		font-size: 28rpx;
+		line-height: 28rpx;
+		text-align: center;
+	}
+</style>

components/xdd-product-item/index.vue

@@ -5,15 +5,13 @@
         v-if="!item.isFarmerShop"
         :src="item[imageKey]"
         class="img"
-        lazy-load
       />
       <image 
         :src="item.farmerShopCover" 
         v-if="item.farmerShopCoverType === 1 && item.isFarmerShop" 
         class="img" 
-        mode="heightFix|widthFix"
+        mode="heightFix|widthFix">
-        lazy-load
+      </image>
-      />
       <image
         :src="item.farmerShopCover + '?vframe/jpg/offset/1'" 
         mode="heightFix|widthFix"
@@ -22,35 +20,24 @@
         :show-fullscreen-btn="false" 
         :show-play-btn="false" 
         class="img"  
-        :poster="item.farmerShopCover + '?vframe/jpg/offset/1'"
+        :poster="item.farmerShopCover + '?vframe/jpg/offset/1'">
-        lazy-load
+      </image>
-      />
       
       <image
         v-if="item.isOldBrand"
         :src="webUrl + '/home/old-mark.png'"
         class="mark-img"
-        lazy-load
-      />
-      <image
-        v-if="item.isGiftCard"
-        style="left: 0;width: 120rpx;"
-        :src="webUrl + '/home/gift-tag.png'"
-        class="mark-img"
-        lazy-load
       />
       <image
         v-if="item.isLandmarkGoods"
         :src="webUrl + '/home/mark-land.png'"
         class="mark-img"
         style="right: 20rpx"
-        lazy-load
       />
       <image
         v-if="item.isCountyFamous"
         :src="webUrl + '/home/qixian-mark.png'"
         class="mark-img"
-        lazy-load
       />
       <image
         v-if="item.isIch"
@@ -62,7 +49,6 @@
         v-if="item.isFarmerShop"
         :src="webUrl + '/orderIcon/nm.png'"
         class="mark-img-nm"
-        lazy-load
       />
     </view>
     <view v-if="item.isFarmerShop" class="more-t v12-pt-2 v12-font-bold  v12-font-28 v12-px-2" >{{ item.farmerShopContent }}</view>
@@ -79,26 +65,12 @@
       </view>
       <view class="price-wrap">
         <view class="price">
-          <view 
+          <text class="price-txt price-red">￥{{ item[priceKey] }}</text>
-            v-if="item.isNegotiable === 1" 
-            class="v12-primary-text v12-font-28 v12-font-weight" 
-          >
-            价格面议
-          </view>
-          <text 
-            v-else
-            class="price-txt price-red">
-            <text class="v12-font-20">
-             ￥ 
-            </text>
-            {{ item[priceKey] }}
-          </text>
         </view>
-        <view v-if="item.isNegotiable === 0" class="btn" @click.stop="$emit('add', item)">
+        <view class="btn" @click.stop="$emit('add', item)">
           <image
             :src="webUrl + '/home/icon-cart.png'"
             class="img"
-            lazy-load
           />
         </view>
       </view>
@@ -107,7 +79,7 @@
       v-if="item.isFarmerShop" 
       class="v12-justify-start v12-align-center v12-pt-2 v12-px-2 v12-pb-2">
       <view class="btn v12-mr-2">
-        <image :src="item.farmerShopLogo" class="nm-img-logo v12-radius-100" lazy-load />
+        <image :src="item.farmerShopLogo" class="nm-img-logo v12-radius-100"></image>
       </view>
       <view class="one-t v12-font-24 v12-dark1-text" style="width:230rpx">{{ item.farmerShopName }}/{{ item.farmerShopCityName || '-' }}</view>
     </view>

components/xdd-tabbar/index.vue

@@ -13,7 +13,7 @@
       <view
         :class="currIndex === 4 ? 'curr' : ''"
         class="name"
-      >吃喝玩乐</view>
+      >寻趣味</view>
     </view>
     <view class="tabbar-list">
       <view
@@ -30,6 +30,7 @@
           @click="gotoPage(item.url, item.type, item.index)"
         >
           <view class="img-wrap">
+            <!-- 预加载两张图片，可以在点击切换的时候不闪屏 -->
             <image
               :src="item.onIcon"
               class="img on"
@@ -40,12 +41,6 @@
             />
           </view>
           <view class="name">{{ item.name }}</view>
-          <view
-            v-if="item.name === '消息' && showUnreadBadge"
-            class="badge"
-          >
-            {{ unreadCountText }}
-          </view>
         </view>
       </view>
     </view>
@@ -53,8 +48,6 @@
 </template>
 
 <script>
-import store from '@/store'
-import { getUnreadMessageCount, getUnreadMessageCountForSeller } from '@/api/rooms'
 export default {
   name: 'XddTabbar',
   props: {
@@ -100,57 +93,14 @@ export default {
           type: 1,
           index: 3
         }
-      ]],
+      ]]
-      unreadCount: 0
-    }
-  },
-  computed: {
-    isLogin() {
-      return store.getters.isLogin
-    },
-    showUnreadBadge() {
-      return this.isLogin && this.unreadCount > 0
-    },
-    unreadCountText() {
-      if (this.unreadCount > 99) {
-        return '99+'
-      }
-      return this.unreadCount
-    }
-  },
-  watch: {
-    isLogin(val) {
-      if (val) {
-        this.fetchUnreadCount()
-      } else {
-        this.unreadCount = 0
-        uni.$emit('updateUnreadMessageCount', 0)
-      }
     }
   },
   mounted() {
     this.getElementData('#quweiIcon')
     this.getIconData('#icon1')
-    if (this.isLogin) {
-      this.fetchUnreadCount()
-    }
-    uni.$on('updateUnreadMessageCount', this.handleUpdateUnreadMessageCount)
-  },
-  beforeDestroy() {
-    uni.$off('updateUnreadMessageCount', this.handleUpdateUnreadMessageCount)
   },
   methods: {
-    handleUpdateUnreadMessageCount(count) {
-      if (!this.isLogin) {
-        this.unreadCount = 0
-        return
-      }
-      if (typeof count === 'number') {
-        this.unreadCount = count
-      } else {
-        this.fetchUnreadCount()
-      }
-    },
     getElementData(el) {
       const query = uni.createSelectorQuery().in(this)
       query.select(el).boundingClientRect().exec((res)=> {
@@ -167,37 +117,10 @@ export default {
         }
       })
     },
-    fetchUnreadCount() {
+    /**
-      uni.request({
+     * 跳转至目标页面
-        url: this.$SERVICE_API_URL + '/unread-num',
+     * type: 1-tabbar页面，2-非tabbar页面
-        method: 'POST',
+    */
-        data: {
-          uid: store.getters.userInfo.uid
-        },
-        success:(res)=>{
-          if(res.data.status_code === 200) {
-            const count = res.data.content || 0
-            getUnreadMessageCount().then(res => {
-              const { success, data } = res
-              if (success) {
-                const _count = data || 0
-                this.unreadCount = count + _count
-                uni.$emit('updateUnreadMessageCount', this.unreadCount)
-              } else {
-                this.unreadCount = 0
-                uni.$emit('updateUnreadMessageCount', 0)
-              }
-            }).catch(() => {
-              this.unreadCount = 0
-              uni.$emit('updateUnreadMessageCount', 0)
-            })
-          } else {
-            this.unreadCount = 0
-          }
-        },
-      })
-      
-    },
     gotoPage(url, type = 1, index) {
       if (this.currIndex === index) return
       if (type === 1) {
@@ -226,7 +149,7 @@ export default {
   background-repeat: no-repeat;
   .center-img {
     position: absolute;
-    top: -20rpx;
+    top: -16rpx;
     left: 50%;
     z-index: 5;
     transform: translateX(-50%);
@@ -276,7 +199,6 @@ export default {
       }
       .item {
         width: 140rpx;
-        position: relative;
         &.curr {
           .name {
             color: #C52733;
@@ -289,21 +211,6 @@ export default {
           }
         }
       }
-      .badge {
-        position: absolute;
-        top: -4rpx;
-        right: 32rpx;
-        min-width: 28rpx;
-        padding: 0 6rpx;
-        height: 28rpx;
-        line-height: 28rpx;
-        border-radius: 14rpx;
-        background-color: #FF564A;
-        color: #ffffff;
-        font-size: 20rpx;
-        text-align: center;
-        box-sizing: border-box;
-      }
     }
   }
 }

components/yzc-paykeyboard/yzc-paykeyboard.vue

@@ -257,7 +257,7 @@
 	}
 	.keyboard-item {
 		box-sizing: border-box;
-		width: 33.333%;
+		width: 250rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;

config/baseSetting.js

@@ -12,14 +12,7 @@ const settings = {
   /* 系统接口前缀，没有统一的填空字符串 */
   sysPrefix: '/',
   /* 是否收集错误日志 */
-  collectRequestError: false,
+  collectRequestError: false
-  /* 订阅消息模板ID */
-  SubscribeMessageTmplIds: [
-    '7O3wKw7_D4t7yfSOlvecKuOQP8QEPY88uBx2FJg43HE',
-    'TSmTnGibZ8IxWCiRWOvLxha6-0u7tE-V1-WbDCiPkKU',
-    '9Q6xLHe6HyjkU5Zn5k_2zxYPf2y4MxVyUbOSW8pcZRU',
-    'v0GegDmzjpqiinmdj7dOwRK1MaTAPVyCOpqn8hJ3Y3Q'
-  ]
 }
 
 export default settings

libs/wechat.js

@@ -1,4 +1,4 @@
-// import { subscribeMessage } from '@/libs/order'
+import { subscribeMessage } from '@/libs/order'
 import { getProvider } from '@/utils'
 import WechatJSSDK from 'wechat-jssdk/dist/client.umd'
 import { getWechatConfig, wechatAuth } from '@/api/public'
@@ -65,7 +65,7 @@ export const weappPay = option => {
           resolve(success)
         }, 3000)
         // #ifdef MP-WEIXIN
-        // subscribeMessage()
+        subscribeMessage()
         // #endif
       },
       fail: error => {

main.js

@@ -75,18 +75,6 @@ const force2Decimal = function change2Decimal(value) {
     return forceToDecimal(value, 2)
 }
 
-const formatCount = function(value) {
-    if (!value) return 0;
-    const num = parseFloat(value);
-    if (isNaN(num)) return 0;
-    if (num >= 10000) {
-        let val = num / 10000;
-        val = parseFloat(val.toFixed(1));
-        return val + '万';
-    }
-    return num;
-}
-
 const toast = (title = '', position = 'center', success = function() {}) => {
 	uni.showToast({
 		title,
@@ -100,7 +88,6 @@ const toast = (title = '', position = 'center', success = function() {}) => {
 
 Vue.prototype.$force2Decimal = force2Decimal
 Vue.prototype.$forceToDecimal = forceToDecimal
-Vue.prototype.$formatCount = formatCount
 
 Vue.config.productionTip = false
 App.mpType = 'app'

manifest.json

@@ -5,7 +5,6 @@
     "versionName" : "4.0.0",
     "versionCode" : 4,
     "transformPx" : false,
-    "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,
@@ -135,8 +134,7 @@
     "mp-weixin" : {
         "appid" : "wx9417047e1a0c340b",
         "setting" : {
-            "urlCheck" : true,
+            "urlCheck" : false
-            "minified" : true
         },
         "usingComponents" : true,
         "permission" : {
@@ -148,16 +146,11 @@
         "plugins" : {
             "live-player-plugin" : {
                 "version" : "1.3.5",
-                // 最新直播组件版本号
+                //最新直播组件版本号
                 "provider" : "wx2b03c6e691cd7370"
-            },
-            "WechatSI" : {
-                "version" : "0.3.6",
-                // TTS版本号
-                "provider" : "wx069ba97219f66d99"
             }
         },
-        // 直播appid
+        //直播appid
         "optimization" : {
             "subPackages" : true
         }

mixins/goCartMixins.js

@@ -14,7 +14,7 @@ export default {
       isOpen: false,
       attrTxt: '',
       attrValue: '',
-      m_id: null,
+      id: null,
       productValueArr: [],
       attr: {
         cartAttr: false,
@@ -33,27 +33,12 @@ export default {
           unique: ''
         }
       },
-      cart_num: 1,
+      cart_num: 1
-      CartCount: 0,
-      // 只有一个规格时直接加入购物车；AI聊天界面则不直接加入购物车，每次都要显示规格选择弹窗
-      onlyOneToAddCart: true
     }
   },
   methods: {
-    // 获取购物车数量
-    getCartCount () {
-      const isLogin = this.isLogin
-      if (isLogin) {
-        getCartCount({
-          numType: 0
-        }).then(res => {
-          this.CartCount = res.data.count
-          this.$forceUpdate()
-        })
-      }
-    },
     getSkuActiveStatus(selectedSku) {
-      getProductSkuBySelected({ id: this.m_id, selectedSku }).then(res => {
+      getProductSkuBySelected({ id: this.id, selectedSku }).then(res => {
         const { success, data } = res
         if (success) {
           for (const key in data) {
@@ -77,7 +62,7 @@ export default {
       })
     },
     productCon() {
-      getProductDetail(this.m_id).then(res => {
+      getProductDetail(this.id).then(res => {
         const { data } = res
         this.storeInfo = {...data.storeInfo}
         if(data.storeInfo.stock === 0) {
@@ -114,8 +99,8 @@ export default {
         // 是否单一规格
         const onlyOne = Object.keys(data.productValue).length === 1
         
-        if(onlyOne && this.onlyOneToAddCart) {
+        if(onlyOne) {
-          this.handleOk(() => this.getCartCount())
+          this.handleOk()
           return
         }
         this.attr.cartAttr = !this.isOpen ? true : false
@@ -237,7 +222,7 @@ export default {
     // 点击加入购物车按钮
     addToCart(item, id = 'id') {
       console.log(item, 'addToCart --------- item');
-      this.m_id = item[id]
+      this.id = item[id]
       
       this.$nextTick(() => {
         this.productCon()
@@ -248,7 +233,7 @@ export default {
       
       
     },
-    handleOk(cb) {
+    handleOk() {
       const productSelect = this.getAttrItemData(this.attrValue)
       // 如果有属性,没有选择,提示用户选择
       const hasNo = (this.attr.productAttr.length && productSelect === undefined && this.isOpen) || productSelect.stock === 0
@@ -261,7 +246,7 @@ export default {
         return
       }
       const q = {
-        productId: this.m_id,
+        productId: this.id,
         cartNum: this.attr.productSelect.cart_num,
         new: 0,
         uniqueId: this.attr.productSelect !== undefined ? this.attr.productSelect.unique : ''
@@ -276,11 +261,9 @@ export default {
           icon: "none",
           duration: 2000
         })
-        cb && cb()
       })
     },
     ChangeCartNum(changeValue) {
-      if(changeValue === 0) return
       // changeValue:是否 加|减
       // 获取当前变动属性
       const productSelect = this.getAttrItemData(this.attrValue)

mixins/orderPaySuccessToCheckDrawStatus.js

@@ -1,72 +0,0 @@
-import { getDrawTicketByOrder } from '@/api/lottery'
-export const orderPaySuccessToCheckDrawStatus = {
-	data(){
-		return {
-      drawTicketPopup: {
-        show: false,
-        ticketCode: '',
-        drawTime: ''
-      }
-		}
-	},
-	methods: {
-    setDrawTicketPopupFromQuery(ticketData = '') {
-      const drawTicketData = ticketData || this.$yroute.query.drawTicketData
-      if (!drawTicketData) {
-        return
-      }
-      let result = {}
-      try {
-        result = typeof drawTicketData === 'string' ? JSON.parse(decodeURIComponent(drawTicketData)) : drawTicketData
-        console.log(result)
-      } catch (e) {
-        result = {}
-      }
-      const hasTicket = Number(result.hasTicket || 0) === 1
-      const howPopup = Number(result.showPopup || 0) === 1
-      if (!hasTicket || !howPopup) {
-        return
-      }
-      this.drawTicketPopup = {
-        show: true,
-        ticketCode: result.ticketCode || result.code || '',
-        drawTime: result.drawTime || ''
-      }
-    },
-    closeDrawTicketPopup() {
-      this.drawTicketPopup.show = false
-    },
-    goHomeFromPopup() {
-      this.drawTicketPopup.show = false
-      uni.switchTab({
-        url: '/pages/home/index'
-      })
-    },
-    goTicketsFromPopup() {
-      this.drawTicketPopup.show = false
-      uni.navigateTo({
-        url: '/pkg-video/views/county-my-tickets'
-      })
-    },
-    buildOrderDetailQuery(orderId, drawTicketResult = {}) {
-      return {
-        id: orderId,
-        drawTicketData: encodeURIComponent(JSON.stringify(drawTicketResult || {}))
-      }
-    },
-    async afterPaySuccess(orderId, fallback) {
-      if (!orderId) {
-        fallback && fallback()
-        return
-      }
-      try {
-        const res = await getDrawTicketByOrder(orderId)
-        const result = (res && res.data) || {}
-        fallback && fallback(result)
-        return
-      } catch (e) {
-      }
-      fallback && fallback({})
-    }
-	}
-}

mixins/share-mixins.js

@@ -1,45 +1,34 @@
-import { getWeixinShareConfig } from '@/api/public'
 export default{
 	data(){
 		return {
-    	//设置默认的分享参数
+            //设置默认的分享参数
-			sharePagePath: '/pages/home/index',
 			share:{
-				title: '云南香道滇官方商城',
+				title:'云南香道滇官方商城',
-				path: this.sharePagePath,
+				path:'/pages/Loading/index',
-				imageUrl: this.$VUE_APP_RESOURCES_URL + '/20210617211221217375.jpg?' + new Date().getTime(),
+				imageUrl:'http://admin-api.xdd618.com/file/pic/20210617211221217375.jpg',
-				desc: '',
+				desc:'',
-				content: ''
+				content:''
 			}
 		}
 	},
 	onShareAppMessage(res) {
-		uni.updateShareMenu({ 
+		return {
-      isPrivateMessage: false,
+			title:this.share.title,
-      withShareTicket: false
+			path:this.share.path,
-    })
+			imageUrl:this.share.imageUrl,
-    return new Promise(async (resolve, reject) => {
+			desc:this.share.desc,
-      const { success, data } = await getWeixinShareConfig()
+			content:this.share.content,
-      if (success) {
+			success(res){
-        resolve({
+				uni.showToast({
-					title: data.title || this.share.title,
+					title:'分享成功'
-					path: data.url || this.share.path,
-					imageUrl: data.image || this.share.imageUrl,
-					desc: this.share.desc,
-					content: this.share.content,
-					success(res){
-						uni.showToast({
-							title:'分享成功'
-						})
-					},
-					fail(res){
-						uni.showToast({
-							title:'分享失败',
-							icon:'none'
-						})
-					}
 				})
-      }
+			},
-    })
+			fail(res){
+				uni.showToast({
+					title:'分享失败',
+					icon:'none'
+				})
+			}
+		}
 	}
 }

package.json

@@ -79,7 +79,6 @@
   "miniapp-color-thief": "^1.0.5",
   "number-precision": "^1.5.2",
   "regenerator-runtime": "^0.12.1",
-  "remove-markdown": "^0.6.2",
   "uview-ui": "2.0.36",
   "vconsole": "^3.14.6",
   "vue": "^2.6.11",

pages.json

@@ -22,6 +22,12 @@
         "navigationBarTitleText": "登录"
       }
     },
+    {
+      "path": "pages/user/RetrievePassword/index",
+      "style": {
+        "navigationBarTitleText": "重置密码"
+      }
+    },
     {
       "path": "pages/home/index",
       "style": {
@@ -45,7 +51,7 @@
     {
       "path": "pages/home/newZone",
       "style": {
-        "navigationBarTitleText": "甄选好礼",
+        "navigationBarTitleText": "新品专区",
         "navigationBarBackgroundColor": "#FFFFFF"
       }
     },
@@ -76,12 +82,24 @@
         "navigationBarTextStyle": "white"
       }
     },
+    {
+      "path": "pages/shop/StoreList/index",
+      "style": {
+        "navigationBarTitleText": "商家列表"
+      }
+    },
     {
       "path": "pages/shop/GoodsList/index",
       "style": {
         "navigationBarTitleText": "搜索"
       }
     },
+    {
+      "path": "pages/NotDefined/index",
+      "style": {
+        "navigationBarTitleText": "404"
+      }
+    },
     {
       "path": "pages/cloud/haveFun",
       "style": {
@@ -104,6 +122,36 @@
         "navigationBarTextStyle": "white"
       }
     },
+    {
+      "path": "pages/shop/GoodsCollection/index",
+      "style": {
+        "navigationBarTitleText": "商品收藏"
+      }
+    },
+    {
+      "path": "pages/shop/EvaluateList/index",
+      "style": {
+        "navigationBarTitleText": "评价列表"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsEvaluate/index",
+      "style": {
+        "navigationBarTitleText": "商品评价"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsPromotion/index",
+      "style": {
+        "navigationBarTitleText": "促销商品"
+      }
+    },
+    {
+      "path": "pages/shop/HotNewGoods/index",
+      "style": {
+        "navigationBarTitleText": "热门商品"
+      }
+    },
     {
       "path": "pages/shop/GoodsCon/index",
       "style": {
@@ -125,24 +173,129 @@
         "navigationBarTitleText": "新增收货地址"
       }
     },
+    {
+      "path": "pages/user/UserAccount/index",
+      "style": {
+        "navigationBarTitleText": "账户余额"
+      }
+    },
     {
       "path": "pages/user/address/AddressManagement/index",
       "style": {
         "navigationBarTitleText": "收货地址"
       }
     },
+    {
+      "path": "pages/user/promotion/Poster/index",
+      "style": {
+        "navigationBarTitleText": "推广名片"
+      }
+    },
+    {
+      "path": "pages/user/signIn/Sign/index",
+      "style": {
+        "navigationBarTitleText": "签到"
+      }
+    },
+    {
+      "path": "pages/user/signIn/SignRecord/index",
+      "style": {
+        "navigationBarTitleText": "签到记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CashAudit/index",
+      "style": {
+        "navigationBarTitleText": "提现结果"
+      }
+    },
+    {
+      "path": "pages/user/promotion/PromoterOrder/index",
+      "style": {
+        "navigationBarTitleText": "分销详情"
+      }
+    },
+    {
+      "path": "pages/user/promotion/PromoterList/index",
+      "style": {
+        "navigationBarTitleText": "分销列表",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/promotion/UserPromotion/index",
+      "style": {
+        "navigationBarTitleText": "团队管理",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/History/index",
+      "style": {
+        "navigationBarTitleText": "商品足迹",
+        "navigationBarBackgroundColor": "#FFFFFF",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/user/UserBill/index",
+      "style": {
+        "navigationBarTitleText": "账单记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CommissionDetails/index",
+      "style": {
+        "navigationBarTitleText": "佣金明细"
+      }
+    },
     {
       "path": "pages/user/signIn/Integral/index",
       "style": {
         "navigationBarTitleText": "我的积分"
       }
     },
+    {
+      "path": "pages/user/UserVip/index",
+      "style": {
+        "navigationBarTitleText": "用户vip"
+      }
+    },
+    {
+      "path": "pages/user/promotion/UserCash/index",
+      "style": {
+        "navigationBarTitleText": "提现"
+      }
+    },
+    {
+      "path": "pages/user/CustomerList/index",
+      "style": {
+        "navigationBarTitleText": "客服列表"
+      }
+    },
+    {
+      "path": "pages/user/Recharge/index",
+      "style": {
+        "navigationBarTitleText": "充值"
+      }
+    },
     {
       "path": "pages/order/MyOrder/index",
       "style": {
         "navigationBarTitleText": "我的订单",
-        "navigationBarBackgroundColor": "#fff",
+        "navigationBarBackgroundColor": "#fff"
-        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/order/Logistics/index",
+      "style": {
+        "navigationBarTitleText": "查看物流"
+      }
+    },
+    {
+      "path": "pages/order/OrderDetails/index",
+      "style": {
+        "navigationBarTitleText": "订单详情"
       }
     },
     {
@@ -152,16 +305,55 @@
         "navigationBarBackgroundColor": "#fff"
       }
     },
+    {
+      "path": "pages/order/PaymentStatus/index",
+      "style": {
+        "navigationBarTitleText": "支付状态"
+      }
+    },
+    {
+      "path": "pages/order/GoodsReturn/index",
+      "style": {
+        "navigationBarTitleText": "商品退货"
+      }
+    },
+    {
+      "path": "pages/order/ReturnList/index",
+      "style": {
+        "navigationBarTitleText": "退货列表"
+      }
+    },
     {
       "path": "pages/map/index",
       "style": {
         "navigationBarTitleText": "地图"
       }
     },
+    {
+      "path": "pages/user/Message/Message",
+      "style": {
+        "navigationBarTitleText": "消息",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/MessageDetail/MessageDetail",
+      "style": {
+        "navigationBarTitleText": "消息详情",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/MemberUpgradeIntro/MemberUpgradeIntro",
+      "style": {
+        "navigationBarTitleText": "升级说明",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
     {
       "path": "pages/VideoPlayBackList/VideoPlayBackList",
       "style": {
-        "navigationBarTitleText": "使用指南",
+        "navigationBarTitleText": "寻看点",
         "navigationBarBackgroundColor": "#FFFFFF"
       }
     },
@@ -171,6 +363,43 @@
         "navigationBarTitleText": "视频详情",
         "navigationBarBackgroundColor": "#FFFFFF"
       }
+    },
+    {
+      "path": "pages/user/UpgradeElectronicProtocol/UpgradeElectronicProtocol",
+      "style": {
+        "navigationBarTitleText": "升级",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/UpgradeProtocolDetail/UpgradeProtocolDetail",
+      "style": {
+        "navigationBarTitleText": "共享股东协议"
+      }
+    },
+    {
+      "path": "pages/LiveAndShortVideo/LiveAndShortVideo",
+      "style": {
+        "navigationBarTitleText": "直播/视频"
+      }
+    },
+    {
+      "path": "pages/LiveBroadcastList/LiveBroadcastList",
+      "style": {
+        "navigationBarTitleText": "直播列表"
+      }
+    },
+    {
+      "path": "pages/user/UserFavorite/UserFavorite",
+      "style": {
+        "navigationBarTitleText": "我的喜欢"
+      }
+    },
+    {
+      "path": "pages/user/Points/index",
+      "style": {
+        "navigationBarTitleText": "积分"
+      }
     }
   ],
   "subPackages": [
@@ -218,8 +447,7 @@
         {
           "path": "inn/innInfoDetail",
           "style": {
-            "navigationBarTitleText": "资讯详情",
+            "navigationBarTitleText": "资讯详情"
-            "navigationBarBackgroundColor": "#FFFFFF"
           }
         },
         {
@@ -251,47 +479,11 @@
             "navigationBarTitleText": "抽奖"
           }
         },
-        {
-          "path": "views/county-lottery",
-          "style": {
-            "navigationBarTitleText": "抽奖"
-          }
-        },
         {
           "path": "views/lottery-log",
           "style": {
             "navigationBarTitleText": "抽奖记录"
           }
-        },
-        {
-          "path": "views/county-lottery-rules",
-          "style": {
-            "navigationBarTitleText": "活动规则"
-          }
-        },
-        {
-          "path": "views/county-my-tickets",
-          "style": {
-            "navigationBarTitleText": "我的抽奖码"
-          }
-        },
-        {
-          "path": "views/county-winners",
-          "style": {
-            "navigationBarTitleText": "中奖名单"
-          }
-        },
-        {
-          "path": "views/county-claim-address",
-          "style": {
-            "navigationBarTitleText": "填写收货地址"
-          }
-        },
-        {
-          "path": "views/county-realname",
-          "style": {
-            "navigationBarTitleText": "实名认证"
-          }
         }
       ]
     },
@@ -316,13 +508,6 @@
             "navigationBarTitleText": "历史会话"
           }
         },
-        {
-          "path": "views/message",
-          "style": {
-            "navigationBarTitleText": "互动消息",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
         {
           "path": "views/xiaoZhi",
           "style": {
@@ -357,20 +542,6 @@
           "style": {
             "navigationBarTitleText": "采购批发商入驻"
           }
-        },
-        {
-          "path": "views/travelResidence",
-          "style": {
-            "navigationBarTitleText": "旅居商家入驻",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
-        {
-          "path": "views/experienceStore",
-          "style": {
-            "navigationBarTitleText": "体验店入驻",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
         }
       ]
     },
@@ -426,7 +597,7 @@
           "path": "views/healthFoods",
           "style": {
             "navigationBarTitleText": "康养旅居",
-            "navigationBarBackgroundColor": "#FFFFFF"
+            "navigationBarBackgroundColor": "#FAEED8"
           }
         },
         {
@@ -519,12 +690,6 @@
             "navigationStyle": "custom"
           }
         },
-        {
-          "path": "views/newsInfo",
-          "style": {
-            "navigationBarTitleText": "资讯详情"
-          }
-        },
         {
           "path": "views/famousQianxianTheme",
           "style": {
@@ -546,28 +711,6 @@
             "navigationStyle": "custom"
           }
         },
-        {
-          "path": "views/oldSojumStore",
-          "style": {
-            "navigationBarTitleText": "",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "views/housekeeperDetail",
-          "style": {
-            "navigationBarTitleText": "",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "views/groupBuyDetails",
-          "style": {
-            "navigationBarTitleText": "团购详情",
-            "navigationStyle": "custom",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
         {
           "path": "views/famousQianxianInvestment",
           "style": {
@@ -623,58 +766,6 @@
           "style": {
             "navigationBarTitleText": "时令尝鲜"
           }
-        },
-        {
-          "path": "views/experienceCoupon",
-          "style": {
-            "navigationBarTitleText": "体验券详情",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
-        {
-          "path": "views/experienceCouponOrderDetail",
-          "style": {
-            "navigationBarTitleText": "订单核销",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
-        {
-          "path": "views/experienceProjectDetail",
-          
-          "style": {
-            "navigationBarTitleText": "体验项目详情",
-            "navigationBarBackgroundColor": "#FFFFFF",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "views/storeLicense",
-          "style": {
-            "navigationBarTitleText": "营业执照",
-            "navigationBarBackgroundColor": "#FFFFFF",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "views/submitOrder",
-          "style": {
-            "navigationBarTitleText": "提交订单",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
-        {
-          "path": "views/sojoumOrderDetails",
-          "style": {
-            "navigationBarTitleText": "订单详情",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
-        {
-          "path": "views/sojoumOrderRefund",
-          "style": {
-            "navigationBarTitleText": "申请退款",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
         }
       ]
     },
@@ -699,13 +790,6 @@
             "navigationBarTitleText": "好友赠送的礼包"
           }
         },
-        {
-          "path": "views/gift/receiveDone",
-          "style": {
-            "navigationBarTitleText": "收礼完成",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
         {
           "path": "views/myFavorite",
           "style": {
@@ -771,7 +855,7 @@
         {
           "path": "views/index",
           "style": {
-            "navigationBarTitleText": "云灵",
+            "navigationBarTitleText": "云灵AI智能助手",
             "navigationStyle": "custom",
             "navigationBarTextStyle": "white"
           }
@@ -779,24 +863,10 @@
         {
           "path": "views/history",
           "style": {
-            "navigationBarTitleText": "云灵",
+            "navigationBarTitleText": "云灵AI智能助手",
             "navigationStyle": "custom",
             "navigationBarTextStyle": "white"
           }
-        },
-        {
-          "path": "views/imageRecognition",
-          "style": {
-            "navigationBarTitleText": "拍照识图",
-            "navigationStyle": "custom",
-            "navigationBarTextStyle": "white"
-          }
-        },
-        {
-          "path": "views/imageRecognitionResult",
-          "style": {
-            "navigationBarTitleText": "云灵"
-          }
         }
       ]
     },
@@ -894,213 +964,6 @@
           }
         }
       ]
-    },
-    {
-      "root": "pagesOrder",
-      "pages": [
-        {
-          "path": "order/GoodsReturn/index",
-          "style": {
-            "navigationBarTitleText": "申请退款"
-          }
-        },
-        {
-          "path": "order/Logistics/index",
-          "style": {
-            "navigationBarTitleText": "查看物流"
-          }
-        },
-        {
-          "path": "order/OrderDetails/index",
-          "style": {
-            "navigationBarTitleText": "订单详情"
-          }
-        },
-        {
-          "path": "order/ReturnList/index",
-          "style": {
-            "navigationBarTitleText": "退货列表"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pagesShop",
-      "pages": [
-        {
-          "path": "shop/EvaluateList/index",
-          "style": {
-            "navigationBarTitleText": "评价列表"
-          }
-        },
-        {
-          "path": "shop/GoodsCollection/index",
-          "style": {
-            "navigationBarTitleText": "商品收藏"
-          }
-        },
-        {
-          "path": "shop/GoodsEvaluate/index",
-          "style": {
-            "navigationBarTitleText": "商品评价"
-          }
-        },
-        {
-          "path": "shop/GoodsPromotion/index",
-          "style": {
-            "navigationBarTitleText": "商品促销"
-          }
-        },
-        {
-          "path": "shop/StoreList/index",
-          "style": {
-            "navigationBarTitleText": "商家列表"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pagesUser",
-      "pages": [
-        {
-          "path": "user/CustomerList/index",
-          "style": {
-            "navigationBarTitleText": "客服列表"
-          }
-        },
-        {
-          "path": "user/History/index",
-          "style": {
-            "navigationBarTitleText": "商品足迹",
-            "navigationBarBackgroundColor": "#FFFFFF",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "user/MemberUpgradeIntro/MemberUpgradeIntro",
-          "style": {
-            "navigationBarTitleText": "升级介绍"
-          }
-        },
-        {
-          "path": "user/Message/Message",
-          "style": {
-            "navigationBarTitleText": "消息",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
-        {
-          "path": "user/MessageDetail/MessageDetail",
-          "style": {
-            "navigationBarTitleText": "消息详情",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
-        {
-          "path": "user/ModifyPayPassword/ModifyPayPassword",
-          "style": {
-            "navigationBarTitleText": "评价列表"
-          }
-        },
-        {
-          "path": "user/Points/index",
-          "style": {
-            "navigationBarTitleText": "积分"
-          }
-        },
-        {
-          "path": "user/Recharge/index",
-          "style": {
-            "navigationBarTitleText": "充值"
-          }
-        },
-        {
-          "path": "user/RetrievePassword/index",
-          "style": {
-            "navigationBarTitleText": "找回密码"
-          }
-        },
-        {
-          "path": "user/UpgradeElectronicProtocol/UpgradeElectronicProtocol",
-          "style": {
-            "navigationBarTitleText": "升级电子协议"
-          }
-        },
-        {
-          "path": "user/UpgradeProtocolDetail/UpgradeProtocolDetail",
-          "style": {
-            "navigationBarTitleText": "升级电子协议详情"
-          }
-        },
-        {
-          "path": "user/UserAccount/index",
-          "style": {
-            "navigationBarTitleText": "账户余额"
-          }
-        },
-        {
-          "path": "user/UserBill/index",
-          "style": {
-            "navigationBarTitleText": "账单记录"
-          }
-        },
-        {
-          "path": "user/UserFavorite/UserFavorite",
-          "style": {
-            "navigationBarTitleText": "我的喜欢"
-          }
-        },
-        {
-          "path": "user/UserVip/index",
-          "style": {
-            "navigationBarTitleText": "用户等级"
-          }
-        },
-        {
-          "path": "user/promotion/CashAudit/index",
-          "style": {
-            "navigationBarTitleText": "提现审核"
-          }
-        },
-        {
-          "path": "user/promotion/CommissionDetails/index",
-          "style": {
-            "navigationBarTitleText": "提现审核"
-          }
-        },
-        {
-          "path": "user/promotion/Poster/index",
-          "style": {
-            "navigationBarTitleText": "海报生成"
-          }
-        },
-        {
-          "path": "user/promotion/PromoterList/index",
-          "style": {
-            "navigationBarTitleText": "分销列表",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        },
-        {
-          "path": "user/promotion/PromoterOrder/index",
-          "style": {
-            "navigationBarTitleText": "分销详情"
-          }
-        },
-        {
-          "path": "user/promotion/UserCash/index",
-          "style": {
-            "navigationBarTitleText": "提现"
-          }
-        },
-        {
-          "path": "user/promotion/UserPromotion/index",
-          "style": {
-            "navigationBarTitleText": "团队管理",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
-        }
-      ]
     }
   ],
   "preloadRule": {

pages/VideoPlayBackList/VideoPlayBackDetail.vue

@@ -1,16 +1,6 @@
 <template>
   <view class="">
-	  <video
+	  <video class="video" :show-fullscreen-btn="false" id="myVideo" autoplay :src="curPlayVideoUrl" @error="videoErrorCallback" controls></video>
-      class="video"
-      :show-fullscreen-btn="false"
-      :direction="videoDirection"
-      id="myVideo"
-      autoplay
-      :src="curPlayVideoUrl"
-      @loadedmetadata="handleLoadedMetadata"
-      @error="videoErrorCallback"
-      controls
-    ></video>
   </view>
 </template>
 <script>
@@ -25,14 +15,12 @@ export default {
   	return {
 		curPlayVideoUrl:'',
 		isVideoPopupShow:false,
-      	pageKeyId: '',
+      	pageKeyId: ''
-      videoDirection: 90,
-      hasLoadedMetadata: false,
-      hasRequestedFullscreen: false
   	}
   },
   onReady(res) {
 	 this.videoContext = uni.createVideoContext('myVideo');
+	 this.videoContext.requestFullScreen();
   },
   onLoad(options) {
     if (!options.click) {
@@ -44,29 +32,6 @@ export default {
     this.pageKeyId = `findVideo_videoId_${id}`
   },
   methods: {
-    handleLoadedMetadata(e) {
-      const detail = e.detail || {}
-      const width = Number(detail.width) || 0
-      const height = Number(detail.height) || 0
-
-      if (height > width && width > 0) {
-        this.videoDirection = 0
-      } else {
-        this.videoDirection = 90
-      }
-
-      this.hasLoadedMetadata = true
-      this.enterFullScreen()
-    },
-    enterFullScreen() {
-      if (!this.videoContext || !this.hasLoadedMetadata || this.hasRequestedFullscreen) {
-        return
-      }
-      this.hasRequestedFullscreen = true
-      this.videoContext.requestFullScreen({
-        direction: this.videoDirection
-      })
-    },
   	videoErrorCallback: function(e) {
   		uni.showModal({
   			content: e.target.errMsg,

pages/cart.vue

@@ -102,14 +102,11 @@
                   <view class="v12-primary-border v12-radius-8 v12-px-1">{{ item.couponName }}</view>
                 </view>
                 <view class="v12-justify-between v12-align-center">
-                  <view class="v12-font-40 v12-font-bold v12-primary-text" v-if="!item.isNegotiable">
+                  <view class="v12-font-40 v12-font-bold v12-primary-text">
                     <text class="">￥</text>
                     <text class="price-txt price-red">{{ item.price }}</text>
                   </view>
-                  <view v-if="item.isNegotiable === 1" class="v12-primary-text v12-font-32 v12-font-weight" @clicks.stop="goRoom(item)">
+                  <view class="btn">
-                  价格面议
-                  </view>
-                  <view class="btn" @click.stop="addToCart(item, 'productId')">
                     <image
                       :src="webUrl + '/home/icon-cart.png'"
                       class="img-icon"
@@ -160,18 +157,11 @@
             >
               <view class="v12-align-center">
                 <CheckboxIcon
-                  v-if="good['truePrice'] !== null || isEdit"
                   :default-state="good['state']"
                   :mark="[index, gIndex]"
                   style="margin-right: 24rpx;"
                   @change="onChange"
                 />
-                <CheckboxIcon
-                  v-else
-                  :default-state="good['state']"
-                  :mark="[index, gIndex]"
-                  style="margin-right: 24rpx;"
-                />
                 <image
                   v-if="good['productInfo']['attrInfo']['image']"
                   :src="good['productInfo']['attrInfo']['image']"
@@ -234,7 +224,7 @@
                       </view>
                     </template>
                     <template v-slot:input>
-                      <input type="number" class="num-input tc v12-num-input" v-model="good['cartNum']" @change="e => inputChangeHandle(index, gIndex, good, e)"/>
+                      <view class="num-input tc v12-num-input">{{ good['cartNum'] }}</view>
                     </template>
                     <template v-slot:plus>
                       <view class="v12-plus-btn v12-font-bold flex jc-center ai-center v12-primary">
@@ -309,14 +299,14 @@
                     :key="attr"
                     :class="{
                       'on': attr.check,
-                      'disabled': getAttrItemData1(attr.attr).stock === 0
+                      'disabled': getAttrItemData(attr.attr).stock === 0
                     }"
                     class="attr"
                     @click="attrItemClick(attr, attrIndex, index)"
                   >
                     {{ attr.attr }}
                     <text
-                      v-if="getAttrItemData1(attr.attr).stock === 0"
+                      v-if="getAttrItemData(attr.attr).stock === 0"
                       class="tag"
                     >缺货</text>
                   </view>
@@ -368,41 +358,28 @@
       </view>
                                                                                                                                                                                                                         
     </u-popup>
-    <ProductWindow
-      ref="attrWindow"
-      :attr="attr"
-      :cartNum="cart_num"
-      :showOk="true"
-      @changeFun="changeFun"
-      @ok="handleOk(() => this.getCart())"
-    />
     <xdd-tabbar :curr-index="2" />
   </view>
 </template>
 <script>
 import XddTabbar from '@/components/xdd-tabbar'
-import ProductWindow from '@/components/ProductWindow'
 import {getAddressList, getUserLike} from "@/api/user";
 import {
   changeCartNum,
   getCartGroup,
   postCartDel,
-  postCartAdd,
   getCartGoodAttr,
   cartGoodChangeAttr
 } from '@/api/store'
 import CheckboxIcon from '@/components/CheckboxIcon.vue'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
-import goCartMixin from '@/mixins/goCartMixins'
-import { mapGetters } from 'vuex'
 import cookie from "@/utils/store/cookie"
 export default {
   components: {
     CheckboxIcon,
-    XddTabbar,
+    XddTabbar
-    ProductWindow
   },
-  mixins: [pageListenMixins, goCartMixin],
+  mixins: [pageListenMixins],
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
@@ -419,18 +396,15 @@ export default {
       },
       showAttr: false,
       pageKeyId: Object.freeze('landmarkGoodsIndex'),
-      cartSelectedIdsCacheKey: Object.freeze('cartSelectedIds'),
       isEdit: false,
       addressList:[],
       addressInfo: {},
       userLikeList: [],
-      selectedCartIds: [],
       // 是否已登录
       isNoLogin: false
     }
   },
   computed: {
-    ...mapGetters(['isLogin']),
     total() {
       let price = 0
       this.list.forEach(item => {
@@ -451,13 +425,11 @@ export default {
     }
   },
   created() {
-    this.selectedCartIds = this.getSelectedCartIds()
     this.getCart()
     this.getAddress()
   },
   onShow() {
     this.isEdit = false
-    uni.$emit('updateUnreadMessageCount')
     if (!this.isLoad) {
       return
     }
@@ -476,25 +448,6 @@ export default {
     this.pageToHideHandle()
   },
   methods: {
-    goRoom(item) {
-      return
-      console.log(item);
-      const params = {
-        goodsId: item.id,
-        goodsName: item.storeName,
-        skuStr: '',
-        price: item.price,
-        seckillId: '',
-        cover: item.image,
-        goodsData: '',
-        seckillData: '',
-        isNegotiable: item.isNegotiable
-      }
-      const name = ''
-      uni.navigateTo({
-        url: `/pkg_common/views/room?id=${this.storeInfo.merId}&name=${name}&params=${JSON.stringify(params)}`
-      })
-    },
     toLoginHandle() {
       cookie.set('redirect', '/pages/cart')
       uni.reLaunch({
@@ -598,75 +551,22 @@ export default {
             isInvalid: true
           }
         })
-        this.list = this.restoreCartState(res.data['valid'].concat(invalid))
+        this.list = res.data['valid'].concat(invalid)
+        this.handleAll(false)
         const _res = await getUserLike()
         this.userLikeList = _res.data
       }
     },
-    getSelectedCartIds() {
-      const ids = uni.getStorageSync(this.cartSelectedIdsCacheKey)
-      return Array.isArray(ids) ? ids : []
-    },
-    syncSelectedCartIds() {
-      const ids = []
-      this.list.forEach(item => {
-        item.carts.forEach(good => {
-          if (good.state) {
-            ids.push(good.id)
-          }
-        })
-      })
-      this.selectedCartIds = ids
-      uni.setStorageSync(this.cartSelectedIdsCacheKey, ids)
-    },
-    refreshSelectionState() {
-      let hasSelectableGoods = false
-      let isAll = true
-      this.list = this.list.map(item => {
-        const selectableCarts = item.carts.filter(() => !item.isInvalid || this.isEdit)
-        if (selectableCarts.length > 0) {
-          hasSelectableGoods = true
-        }
-        item.state = selectableCarts.length > 0 && selectableCarts.every(good => good.state)
-        if (selectableCarts.length > 0 && !item.state) {
-          isAll = false
-        }
-        return item
-      })
-      this.isAll = hasSelectableGoods && isAll
-      this.syncSelectedCartIds()
-    },
-    restoreCartState(list) {
-      const selectedCartIds = new Set(this.selectedCartIds)
-      const nextList = list.map(item => {
-        const canSelect = !item.isInvalid || this.isEdit
-        const carts = item.carts.map(good => {
-          return {
-            ...good,
-            state: canSelect ? selectedCartIds.has(good.id) : false
-          }
-        })
-        return {
-          ...item,
-          carts,
-          state: false
-        }
-      })
-      this.list = nextList
-      this.refreshSelectionState()
-      return this.list
-    },
     handleAll(state) {
+      this.isAll = state
       this.list = this.list.map(item => {
-        const canSelect = !item.isInvalid || this.isEdit
+        item.state = state
-        item.state = canSelect ? state : false
         item.carts = item.carts.map(good => {
-          good.state = canSelect ? state : false
+          good.state = state
           return good
         })
         return item
       })
-      this.refreshSelectionState()
     },
     navToStore(id) {
       if (id === 0) {
@@ -685,7 +585,6 @@ export default {
       if (mark.length === 1) {
         if (mark[0] === -1) {
           this.handleAll(state)
-          return
         } else {
           this.list[mark[0]]['state'] = state
           this.list[mark[0]]['carts'] = this.list[mark[0]]['carts'].map(good => {
@@ -705,34 +604,15 @@ export default {
         })
         this.list[mark[0]]['state'] = count === length
       }
-      this.refreshSelectionState()
+      let shopCheckNumber = 0
-    },
+      this.list.map(item => {
-    inputChangeHandle(index, gIndex, good, e) { 
+        if (item.state) {
-      
+          shopCheckNumber++
-      if(+good.cartNum > good['productInfo']['attrInfo']['stock']) {
-        good.cartNum = good['productInfo']['attrInfo']['stock']
-      }
-      if(good.cartNum < 1) {
-        good.cartNum  = 1
-      }
-      const value = +good.cartNum
-      console.log('index', value);
-      const id = good.id
-      // uni.showLoading()
-      changeCartNum(id, value).then(res => {
-        const { success } = res
-        if (success) {
-          // uni.hideLoading()
-          this.$set(this.list[index].carts[gIndex], 'cartNum', value)
         }
-      }).catch(() => {
-        setTimeout(() => {
-          uni.hideLoading()
-        }, 3000)
       })
+      this.isAll = shopCheckNumber === this.list.length
     },
     changeNumHandle(index, gIndex, good, e) {
-      console.log(good);
       const { type } = e
       const value = good.cartNum + (type === 'plus' ? 1 : -1)
       console.log('index', value);
@@ -831,7 +711,7 @@ export default {
         uni.hideLoading()
       })
     },
-    getAttrItemData1(attr) {
+    getAttrItemData(attr) {
       let result = {
         stock: 0
       }
@@ -970,8 +850,8 @@ export default {
   border-radius: 28rpx 0rpx 0rpx 28rpx;
   border: 1px solid #E6E6E6;
   background-color: rgba(208,208,208,0.39);
-  height: 44rpx;
+  height: 40rpx;
-  width: 44rpx;
+  width: 40rpx;
   padding: 0 20rpx;
   font-weight: bold;
 }
@@ -979,8 +859,8 @@ export default {
   border-radius: 0rpx 28rpx 28rpx 0rpx;
   border: 1px solid #C52733;
   background-color: #C52733;
-  height: 44rpx;
+  height: 40rpx;
-  width: 44rpx;
+  width: 40rpx;
   padding: 0 20rpx;
   font-weight: bold;
 }
@@ -1091,7 +971,7 @@ view {
   right: 0;
   margin: auto;
   border-radius: 26rpx;
-  z-index: 9;
+
   .btn-submit {
     width: 196rpx;
     height: 64rpx;
@@ -1288,4 +1168,4 @@ view {
     background-color: #C52733;
   }
 }
-</style>
+</style>

pages/chose-city/chose-city.vue

@@ -341,11 +341,10 @@ export default {
     },
     async getMapData() {
       const map = await getLocation()
-      if (map.length > 1) {
+      if (map) {
         const {latitude, longitude} = map[1]
-        getCurAddress(latitude, longitude, address => {
+        const address = await getCurAddress(latitude, longitude)
-          this.location = address.city
+        this.location = address[1].data.result.ad_info.city
-        })
       }
     },
     init() {

pages/cloud/cloud.vue

@@ -74,7 +74,7 @@
 </template>
 
 <script>
-import { getCurAddress, getLocation } from "@/utils/common"
+import config from '@/utils/mapConfig'
 import {
   getHotelTypeList,
   getHotelList
@@ -124,19 +124,56 @@ export default {
       })
     },
     //获取当前定位地址
-    async getCurAddressFn() {
+    getCurAddress() {
       const that = this
+      //定位
       uni.showLoading({
         title: '定位中...'
       })
-      const map = await getLocation()
+      uni.getLocation({
-      if (map.length > 1) {
+        type: 'wgs84',
-        const {latitude, longitude} = map[1]
+        success: function(res) {
-        getCurAddress(latitude, longitude, address => {
+          let latitude = res.latitude
-          that.cityName = address.city
+          let longitude = res.longitude
-          that.paramCity = address.city
+          // #ifdef H5
-        })
+          Vue.jsonp(
-      }
+            'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude + '&key=' +
+            config.key, {
+              output: 'jsonp',
+            }).then(json => {
+            // Success.
+            uni.hideLoading();
+            that.cityName = json.result.ad_info.city
+            that.paramCity = json.result.ad_info.city
+            //定位成功刷新数据
+            that.fetchList()
+          }).catch(err => {
+            uni.hideLoading()
+          })
+          // #endif
+
+          // #ifndef H5
+          uni.request({
+            url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude +
+              '&key=' + config.key,
+            success: function(res) {
+              uni.hideLoading();
+
+              that.cityName = res.data.result.ad_info.city
+              that.paramCity = res.data.result.ad_info.city
+              //定位成功刷新数据
+              that.fetchList()
+            },
+            fail: function(res) {
+              uni.hideLoading()
+            }
+          })
+          // #endif
+        },
+        fail: function(res) {
+          uni.hideLoading()
+        }
+      })
     },
     fetchTypeList() {
       this.hotelList = []
@@ -158,7 +195,7 @@ export default {
             this.fetchList()
             uni.removeStorageSync('cityName')
           } else {
-            this.getCurAddressFn()
+            this.getCurAddress()
           }
         }
       })

pages/cloud/haveFun.vue

@@ -76,7 +76,7 @@
         </view>
       </view>
     </view>
-    <view class="type-banner-wrap" v-if="typeIndex !== -1">
+    <view class="type-banner-wrap">
       <view v-if="currType.titleImage" class="title">
         <image
           :src="currType.titleImage"
@@ -84,7 +84,7 @@
           class="img"
         />
       </view>
-      <view v-if="hotelBanner.length" class="slider-wrap">
+      <view v-if="currType.carousel" class="slider-wrap">
         <swiper
           indicatorDots="true"
           indicator-color="rgba(255, 255, 255, .3)"
@@ -94,12 +94,12 @@
           style="height: 330rpx;"
         >
           <block
-            v-for="(item, bannerIndex) in hotelBanner"
+            v-for="(item, bannerIndex) in currType.carousel"
             :key="bannerIndex"
           >
             <swiper-item>
               <view class="swiper-item" @click="typeBannerItemClick(item)">
-                <image :src="item.bannerImage" class="img" />
+                <image :src="item.carouselImage" class="img" />
               </view>
             </swiper-item>
           </block>
@@ -120,9 +120,9 @@
         </view>
     </view>
     <view class="body" v-else>
-      <view class="v12-justify-between v12-align-center" v-if="hotelList.length > 0">
+      <view class="v12-justify-between v12-align-center">
-        <text class="v12-font-bold" v-if="hotelBanner.length">推荐</text>
+        <text class="v12-font-bold" v-if="currType.carousel">推荐</text>
-        <view class="v12-dark1-text v12-font-28 v12-align-center refresh-btn" @click="handleRefresh">
+        <view class="v12-dark1-text v12-font-28 v12-align-center" @click="handleRefresh">
           <u-icon name="reload"></u-icon>
           换一换
         </view>
@@ -163,28 +163,22 @@
       />
     </view>
     <FunctionGuide @hide="setGuide('findFunIndex')" :maxStep="3" :guideData="functionGuideData" ref="FunctionGuide"></FunctionGuide>
-    <AiEntrance
-      :city-name="cityName"
-    />
     <xdd-tabbar :curr-index="4" />
   </view>
 </template>
 <script>
-import { getHotelList, getHotelTypeList, getAncientTownIcon, getAncientTownList, getHotelBanner } from "@/api/inn.js"
+import { getHotelList, getHotelTypeList, getAncientTownIcon, getAncientTownList } from "@/api/inn.js"
-import { fetchCity } from "@/api/wenwan"
 import { getCurAddress, getLocation } from "@/utils/common"
 import FunHotelItem from './components/HotelItem'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
 import XddTabbar from '@/components/xdd-tabbar'
 import FunctionGuide from '@/components/FunctionGuide'
-import AiEntrance from '@/components/aiChat/entrance'
 import GuideMixins from '@/mixins/GuideMixins'
 export default {
   components: {
     FunHotelItem,
     XddTabbar,
-    FunctionGuide,
+    FunctionGuide
-    AiEntrance
   },
   mixins: [pageListenMixins, GuideMixins],
   data() {
@@ -203,10 +197,7 @@ export default {
       isNext: false,
       townConfig: {},
       townList: [],
-      randomSeed: null,
+      randomSeed: null
-      hotelBanner: [],
-      goodCityId: '',
-      cityOptions: []
     }
   },
   computed: {
@@ -227,12 +218,8 @@ export default {
 		  this.fetchList(random, this.randomSeed)
     }
 	},
-  onLoad(options) {
+  onLoad() {
     this.currType = {}
-    if (options && options.city) {
-      this.goodCityId = options.city
-    }
-    this.initGoodCity()
     getHotelTypeList().then(({data}) => {
       this.typeList = data
       this.currType = this.typeIndex === -1 ? {} : data[this.typeIndex]
@@ -242,7 +229,6 @@ export default {
     this.queryGuide('findFunIndex')
   },
   onShow() {
-    uni.$emit('updateUnreadMessageCount')
     const memCityName = uni.getStorageSync('cityName')
     // this.typeIndex = 0
     this.name = ''
@@ -255,8 +241,7 @@ export default {
   watch: {
     cityName: {
       handler(value) {
-        if (value) {
+        if(value) {
-          this.updateGoodCityId()
           this.search()
         }
       },
@@ -455,27 +440,6 @@ export default {
         this.townConfig = res.data
       })
     },
-    initGoodCity() {
-      fetchCity(2).then(({ data }) => {
-        const group = data && data.group ? data.group : []
-        const list = []
-        group.forEach(item => {
-          if (item.city && item.city.length) {
-            list.push(...item.city)
-          }
-        })
-        this.cityOptions = list
-        this.updateGoodCityId()
-      })
-    },
-    updateGoodCityId() {
-      if (!this.cityOptions.length || !this.cityName) return
-      const found = this.cityOptions.find(item => item.cityName === this.cityName)
-      if (found) {
-        this.goodCityId = found.id || found.cityId || this.goodCityId
-        this.fetchHotelBanner()
-      }
-    },
     goCity() {
       uni.navigateTo({
         url: `/pages/chose-city/chose-city?type=2&city=${this.cityName}`
@@ -488,11 +452,13 @@ export default {
     },
     async getMapData() {
       const map = await getLocation()
-      if (map.length > 1 && !this.cityName) {
+      if (map.length > 1) {
         const {latitude, longitude} = map[1]
-        getCurAddress(latitude, longitude, address => {
+        const address = await getCurAddress(latitude, longitude)
-          this.cityName = address.city
+        if(!this.cityName) {
-        })
+          this.cityName = address[1].data.result.ad_info.city
+        }
+        // this.search()
       }
     },
     tapType(index) {
@@ -562,24 +528,6 @@ export default {
         uni.hideLoading()
       })
     },
-    fetchHotelBanner() {
-      if (!this.goodCityId) {
-        return
-      }
-      const params = {
-        goodCityId: this.goodCityId
-      }
-      getHotelBanner(params).then(res => {
-        const { success, data } = res
-        if (success && data) {
-          if (Array.isArray(data.hotelBanner)) {
-            this.hotelBanner = data.hotelBanner
-          } else if (Array.isArray(data)) {
-            this.hotelBanner = data
-          }
-        }
-      })
-    },
     typeBannerItemClick(item) {
       if (!item.hotelId) return
       uni.navigateTo({ url: `/pagesInn/inn/innHome?id=${item.hotelId}` })
@@ -760,10 +708,6 @@ export default {
     background: #f5f5f5;
   }
 
-  .refresh-btn {
-    margin-left: auto;
-  }
-
   .city-box {
     display: inline-flex;
     align-items: center;

pages/home/components/information.vue

@@ -54,7 +54,7 @@
                   :src="webUrl + '/20230803152147141807.png'"
                   class="icon"
                 />
-                <text class="seeNum-txt v12-font-28">{{ $formatCount(item.pv) }}</text>
+                <text class="seeNum-txt v12-font-28">{{ item.pv }}</text>
               </view>
               <view class="flex">
                 <image
@@ -73,7 +73,7 @@
                   v-show="item.zan > 0"
                   :class="item.hasZan ? 'on' : ''"
                   class="seeNum-txt v12-font-28 v12-ml-1"
-                  >{{ $formatCount(item.zan) }}</text
+                  >{{ item.zan }}</text
                 >
               </view>
             </view>

pages/home/landMark_bak20240815.vue

@@ -0,0 +1,454 @@
+<template>
+  <view class="pkg-product-land-mark" v-if="mapData">
+    <view class="top-box" :style="{'backgroundColor':topBoxBgColor}">
+      <view class="view-box">
+        <view class="search-box flex ai-center">
+          <input
+            v-model="keyword"
+            type="text"
+            placeholder="搜索商品"
+            placeholder-style="color:#999"
+            @confirm="search()"
+          />
+          <image
+            :src="webUrl+'/20231223183627184005.png'"
+            mode="scaleToFill"
+            style="width:30rpx;height:30rpx"
+            @click="search()"
+          />
+        </view>
+
+        <view class="map-box">
+          <image class="img-map" :src="mapData.mapImage" mode="widthFix"/>
+
+          <view
+            v-for="(item, index) in mapLocations"
+            :key="index"
+            class="item"
+            :style="{'left':item.gx+'rpx','top':item.gy+'rpx'}"
+            @click="goGoods(item.productId)"
+          >
+            <view class="round">
+              <view class="line" :class="'line-'+directionClass[item.labelDirection]"></view>
+            </view>
+            <view class="label flex ai-end" :class="'label-'+directionClass[item.labelDirection]">
+              <image class="cover flex-0" :src="item.mapImage" mode="scaleToFill" v-if="item.labelDirection===4"/>
+              <view class="title flex ai-center">{{ item.mapTitle }}</view>
+              <image class="cover flex-0" :src="item.mapImage" mode="scaleToFill" v-if="item.labelDirection!==4"/>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view class="nav flex">
+        <view class="flex flex-0 ai-center" :class="{'active': navIndex===index}" v-for="(item,index) in navList"
+              :key="index" @click="changeNav(index)">{{ item.provinceName }}
+        </view>
+      </view>
+    </view>
+
+    <view class="main-box" v-if="mapData.recommended.storeImage"
+          @click="goGoods(mapData.recommended.productId)">
+      <image class="bg-main" :src="mapData.recommended.storeImage" mode="scaleToFill"/>
+      <view class="box-mask flex flex-col jc-end">
+        <view class="one-t bold">{{ mapData.recommended.title }}</view>
+        <view class="more-t">{{ mapData.recommended.description }}</view>
+      </view>
+    </view>
+
+    <view class="list-box flex flex-wrap">
+      <view class="item" v-for="item in goods" :key="item.id" @click="goGoods(item.productId)">
+        <image :src="item.storeImage" mode="scaleToFill"/>
+        <view class="content flex flex-col jc-between">
+          <view class="more-t bold">{{ item.title }}</view>
+          <view class="flex jc-between ai-center">
+            <text class="price">￥{{ item.price }}</text>
+            <image class="btn" :src="webUrl+'/20231114151028082368.png'" mode="scaleToFill"/>
+<!--            <view class="btn flex jc-center ai-center">立即购买</view>-->
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <image class="img-nodata" :src="webUrl+'/20231023131208675588.png'" mode="scaleToFill"
+           v-if="goods.length===0"/>
+  </view>
+</template>
+
+<script>
+import {getProvince, getProvinceGoods, getProvinceList} from "@/api/product";
+import { pageListenMixins } from '@/mixins/pageListenMixins'
+
+export default {
+  name: 'LandMarkPage',
+  mixins: [pageListenMixins],
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      keyword: '',
+      page: 1,
+      navList: [],
+      navIndex: 0,
+      mapData: null,
+      mapLocations: [],
+      goods: [],
+      directionClass: ['', 'up', 'right', 'down', 'left'],
+      pageKeyId: Object.freeze('landmarkGoodsIndex')
+    }
+  },
+  computed: {
+    topBoxBgColor() {
+      return this.navList.length > 0 ? this.navList[this.navIndex]['backgroundColor'] : '#FFFFFF';
+    },
+    viewBoxBgColor() {
+      return this.mapData?.backgroundColor || '#FFFFFF';
+    },
+    scale() {
+      return 718 / (this.mapData?.mapImageWidth || 1);
+    }
+  },
+  onLoad() {
+    this.getNavList();
+  },
+  onHide() {
+    this.pageToHideHandle()
+  },
+  onReachBottom() {
+    this.page++;
+    this.fetchGoods();
+  },
+  methods: {
+    getNavList() {
+      getProvinceList().then(({data}) => {
+        this.navList = data;
+        this.changeNav(this.navIndex);
+      });
+    },
+
+    search() {
+      this.page = 1;
+      this.fetchGoods();
+    },
+
+    changeNav(index) {
+      this.navIndex = index;
+      this.page = 1;
+      this.getMap();
+      this.fetchGoods();
+    },
+
+    getMap() {
+      const id = this.navList[this.navIndex]['id']
+      getProvince(id).then(({data}) => {
+        this.mapData = data;
+        this.mapLocations = data.mapLocations;
+        this.calcPosition();
+      });
+    },
+
+    // 计算位置
+    calcPosition() {
+      this.mapLocations?.forEach(item => {
+        item.gx = item.x * this.scale;
+        item.gy = item.y * this.scale;
+      })
+    },
+
+    fetchGoods() {
+      const id = this.navList[this.navIndex]['id']
+      getProvinceGoods(id, this.keyword, this.page).then(({data}) => {
+        if (this.page === 1) this.goods = [];
+        for (let i = 0; i < data.length; i++) {
+          this.goods.push(data[i]);
+        }
+      })
+    },
+    goGoods(id) {
+      uni.navigateTo({
+        url: `/pages/shop/GoodsCon/index?id=${id}&from=landmark`
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.pkg-product-land-mark {
+  background: #F7F3ED;
+
+  image {
+    vertical-align: middle;
+  }
+
+  .top-box {
+    padding: 32rpx 0 20rpx;
+
+    .view-box {
+      position: relative;
+      margin: 0 16rpx;
+      border-radius: 40rpx;
+      overflow: hidden;
+
+      .search-box {
+        position: absolute;
+        top: 20rpx;
+        left: 34rpx;
+        width: 650rpx;
+        height: 64rpx;
+        padding: 0 32rpx;
+        box-sizing: border-box;
+        border-radius: 32rpx;
+        background: #FFFFFF;
+        z-index: 10;
+
+        input {
+          width: 100%;
+          height: 100%;
+          line-height: 64rpx;
+          font-size: 28rpx;
+        }
+      }
+
+      .map-box {
+        position: relative;
+        width: 718rpx;
+
+        .img-map {
+          width: 718rpx;
+          height: auto;
+        }
+
+        .item {
+          position: absolute;
+
+          .round {
+            width: 8rpx;
+            height: 8rpx;
+            border-radius: 50%;
+            box-shadow: 0 0 0 8rpx rgba(225, 38, 65, .4);;
+            background: #E12641;
+          }
+
+          .line {
+            position: relative;
+            border: 2rpx solid #E12641;
+          }
+
+          .line-up {
+            left: 50%;
+            transform: translate(-50%, -100%);
+            width: 0;
+            height: 30rpx;
+          }
+
+          .line-right {
+            top: 50%;
+            transform: translate(0, -50%);
+            width: 30rpx;
+            height: 0;
+          }
+
+          .line-down {
+            left: 50%;
+            transform: translate(-50%, 0);
+            width: 0;
+            height: 30rpx;
+          }
+
+          .line-left {
+            top: 50%;
+            transform: translate(-100%, -50%);
+            width: 30rpx;
+            height: 0;
+          }
+
+          .label {
+            position: relative;
+
+            .cover {
+              width: 60rpx;
+              height: 60rpx;
+              box-sizing: border-box;
+              border: 6rpx solid #E12641;
+              border-radius: 50%;
+              z-index: 20;
+            }
+
+            .title {
+              height: 32rpx;
+              box-sizing: border-box;
+              margin-bottom: 10rpx;
+              padding: 0 16rpx;
+              background: #E12641;
+              color: #FFFFFF;
+              font-size: 22rpx;
+              line-height: 32rpx;
+              white-space: nowrap;
+              z-index: 10;
+            }
+          }
+
+          .label-up {
+            top: -80rpx;
+            left: -50%;
+
+            .title {
+              margin-right: -9rpx;
+              border-radius: 20rpx 0 0 20rpx;
+            }
+          }
+
+          .label-right {
+            top: -40rpx;
+            left: 32rpx;
+
+            .title {
+              margin-right: -9rpx;
+              border-radius: 20rpx 0 0 20rpx;
+            }
+          }
+
+          .label-down {
+            left: -50%;
+
+            .title {
+              margin-right: -9rpx;
+              border-radius: 20rpx 0 0 20rpx;
+            }
+          }
+
+          .label-left {
+            left: -100%;
+            transform: translate(-30rpx, -40rpx);
+
+            .title {
+              margin-left: -9rpx;
+              border-radius: 0 20rpx 20rpx 0;
+            }
+          }
+        }
+      }
+    }
+
+    .nav {
+      padding: 30rpx 20rpx 0;
+      overflow-x: scroll;
+
+      view {
+        height: 52rpx;
+        box-sizing: border-box;
+        padding: 0 18rpx;
+        border: 4rpx solid transparent;
+        color: #FFFFFF;
+        font-size: 32rpx;
+      }
+
+      .active {
+        border-color: #FFFFFF;
+        border-radius: 26rpx;
+      }
+    }
+  }
+
+  .main-box {
+    position: relative;
+    width: 718rpx;
+    height: 360rpx;
+    margin: 24rpx 16rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+
+    .bg-main {
+      width: 718rpx;
+      height: 360rpx;
+    }
+
+    .box-mask {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      width: 100%;
+      height: 200rpx;
+      box-sizing: border-box;
+      padding: 20rpx 16rpx 16rpx;
+      background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, #000000 100%);
+      color: #FFFFFF;
+
+      .one-t {
+        margin-bottom: 16rpx;
+        font-size: 46rpx;
+        line-height: 52rpx;
+      }
+
+      .more-t {
+        width: 100%;
+        box-sizing: border-box;
+        padding-top: 10rpx;
+        border-top: 1rpx solid #FFFFFF;
+        font-size: 28rpx;
+        line-height: 32rpx;
+      }
+    }
+  }
+
+  .list-box {
+    margin-top: 24rpx;
+    padding: 0 16rpx 34rpx;
+
+    .item {
+      width: 234rpx;
+      height: 380rpx;
+      margin-right: 8rpx;
+      margin-bottom: 24rpx;
+      border-radius: 12rpx;
+      background: #FFFFFF;
+      overflow: hidden;
+
+      image {
+        width: 234rpx;
+        height: 234rpx;
+      }
+
+      .content {
+        height: 122rpx;
+        margin: 6rpx 6rpx 18rpx;
+
+        .more-t {
+          font-size: 28rpx;
+          line-height: 36rpx;
+          color: #333333;
+        }
+
+        .price {
+          font-size: 28rpx;
+          line-height: 36rpx;
+          color: #DC1616;
+        }
+
+        .btn {
+          width: 118rpx;
+          height: 42rpx;
+          //background: linear-gradient(180deg, #EFEDC7 0%, #EAC94B 100%);
+          //border-radius: 4rpx;
+          //color: #764A00;
+          //font-size: 24rpx;
+        }
+      }
+    }
+
+    .item:nth-child(3n) {
+      margin-right: 0;
+    }
+  }
+
+  .img-nodata {
+    position: relative;
+    top: 0;
+    left: 50%;
+    transform: translate(-50%, 0);
+    width: 352rpx;
+    height: 338rpx;
+    margin-bottom: 60rpx;
+  }
+}
+</style>

pages/home/newZone.vue

@@ -11,7 +11,7 @@
         </swiper-item>
       </swiper> -->
       <view class="swiper-wrap">
-        <swiper @change="handleChange" style="height: 100%;" autoplay  circular next-margin="460rpx" interval="4000">
+        <swiper @change="handleChange" style="height: 100%;" autoplay circular next-margin="460rpx" interval="4000">
           <swiper-item v-for="(item, index) in details.newProducts" :key="index" @click="toGoods(item)">
             <view class="new-card" :class="{'is-actived': current == index}">
               <image :src="item.productCover" class="new-card-img" mode="heightFix|widthFix"></image>
@@ -29,39 +29,8 @@
         </swiper>
       </view>
     </view>
-    <view class="v12-align-center tabs-wrap v1-py-1 v12-my-4">
+
-      <view class="tab-item v12-font-bold" v-for="(tab, index) in tabs" :key="index" @click="handleClick(index, tab)">
+    <view class="v12-mt-2 v12-align-center">
-        {{ tab.cateName }}
-        <view class="tab-line" v-if="activeIndex == index"></view>
-      </view>
-    
-    </view>
-    <view class="product-wrap v12-mt-3">
-      <view class="product-card" v-for="(item, index) in products" :key="index" @click="toGoods(item)">
-        <image :src="item.productImage" class="product-card-img" mode="heightFix|widthFix"></image>
-        <view class="new-info">
-          <view class="v12-font-26 more-t" style="width: 100%;">{{ item.productName }}</view>
-          <view style="width: 100%;" class="v12-font-bold v12-primary-text v12-align-center v12-justify-between">
-            <view>
-              <text>￥</text>
-                <text class=" v12-font-36">{{ item.productPrice }}</text>
-            </view>
-            <view @click.stop="addToCart(item, 'productId')">
-              <u-icon :name="webUrl + '/home/icon-cart.png'" size="24"></u-icon>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <ProductWindow
-      ref="attrWindow"
-      :attr="attr"
-      :cartNum="cart_num"
-      :showOk="true"
-      @changeFun="changeFun"
-      @ok="handleOk(() => this.getCartCount())"
-    />
-    <!-- <view class="v12-mt-2 v12-align-center">
       <view class="primary-title" v-if="details.contentTitle">
         {{ details.contentTitle }}
         <view class="title-line"></view>
@@ -73,47 +42,30 @@
     </view>
     <view class="cover-img v12-mt-2" v-for="(item, index) in details.contents" :key="index" @click="toGoods(item)">
       <image :src="item.contentImage" class="cover-img" mode="heightFix|widthFix"></image>
-    </view> -->
+    </view>
   </view>
 </template>
 <script>
 import { queryNewZone } from '@/api/activity'
-import ProductWindow from '@/components/ProductWindow'
-import goCartMixin from '@/mixins/goCartMixins'
-import { mapGetters } from 'vuex'
 export default{
-  components: {
-    ProductWindow
-  },
-  mixins: [goCartMixin],
   data() {
     return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
       details: {},
       current: 0,
-      tabs: [],
-      activeIndex: 0,
-      products: []
     }
   },
   onLoad() {
     queryNewZone().then(res => {
       this.details = res.data 
-      this.tabs = res.data.categories
-      this.handleClick(0, this.tabs[0])
     })
   },
   computed: {
-    ...mapGetters(['isLogin', 'location', 'userInfo']),
     bannerImage() {
       return this.details.newProducts && this.details.newProducts[this.current] && this.details.newProducts[this.current].bannerImage
     }
+
   },
   methods: {
-    handleClick(index, tab) {
-      this.activeIndex = index
-      this.products = tab.products
-    },
     handleChange(e) {
       this.current = e.detail.current
     },
@@ -126,50 +78,10 @@ export default{
 }
 </script>
 <style lang="scss" scoped>
-.product-card{
-  width: 342rpx;
-  height: 520rpx;
-  background: #fff;
-  border-radius: 20rpx;
-  margin-bottom: 20rpx;
-}
-.product-card-img{
-  width: 344rpx;
-  height: 344rpx;
-  background: rgba(169,56,56,0.39);
-  border-radius: 20rpx;
-}
-.product-wrap{
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-}
-.tab-line{
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 6rpx;
-  background: linear-gradient(to right, #C52733 0%, rgba(202,56,67,0.92) 51%, rgba(255,255,255,0) 100%);
-  border-radius: 6rpx;
-}
-.tabs-wrap{
-  overflow: auto;
-  justify-content: space-between;
-}
-.tab-item{
-  margin-right: 20rpx;
-  white-space: nowrap;
-  position: relative;
-  &:last-child{
-    margin-right: 0;
-  }
-}
 .new-info{
   display: flex;
   align-items: center;
   flex-direction: column;
-  padding: 20rpx;
 }
 .box-emp{
   width: 100%;
@@ -180,7 +92,7 @@ export default{
   width: fit-content;
   color: #fff;
   background: #C52733;
-  font-size: 30rpx;
+  font-size: 28rpx;
   padding: 4rpx 20rpx;
 }
 .swiper-wrap{
@@ -192,7 +104,7 @@ export default{
 }
 .new-card{
   width: 220rpx;
-  // height: 240rpx;
+  height: 240rpx;
   background: #fff;
   border-radius: 20rpx;
   position: absolute;
@@ -248,7 +160,7 @@ export default{
 }
   .new-zone-page{
     min-height: 100vh;
-    // background-color: #fff;
+    background-color: #fff;
     padding: 20rpx;
   }
   .banner-zone{
@@ -257,4 +169,4 @@ export default{
     border-radius: 20rpx !important;
     position: relative !important;
   }
-</style>
+</style>

pages/order/GoodsReturn/index.vue

@@ -2,12 +2,11 @@
 	<view class="apply-return">
 		<view class="goodsStyle acea-row row-between" v-for="cart in orderInfo.cartInfo" :key="cart.id">
 			<view class="pictrue">
-				<image v-if="orderInfo.isGiftCardReceiveBlind === 0" :src="cart.productInfo.image" class="image" />
+				<image :src="cart.productInfo.image" class="image" />
-				<image v-else class="image" :src="webUrl+'/orderIcon/盲盒礼包.png'"></image>
 			</view>
-			<view class="text acea-row row-between" >
+			<view class="text acea-row row-between">
-				<view class="name line2">{{ orderInfo.isGiftCardReceiveBlind === 0 ? cart.productInfo.storeName : '盲盒礼包' }}</view>
+				<view class="name line2">{{ cart.productInfo.storeName }}</view>
-				<view class="money" v-if="orderInfo.isGiftCardReceiveBlind === 0">
+				<view class="money">
 					<view>
 						￥{{
             cart.productInfo.attrInfo
@@ -24,7 +23,7 @@
 				<view>退货件数</view>
 				<view class="num">{{ orderInfo.totalNum }}</view>
 			</view>
-			<view class="item acea-row row-between-wrapper" v-if="orderInfo.isGiftCardReceiveBlind === 0">
+			<view class="item acea-row row-between-wrapper">
 				<view>退款金额</view>
 				<view class="num">￥{{ orderInfo.payPrice }}</view>
 			</view>
@@ -66,7 +65,6 @@ export default {
 	mixins: [pageListenMixins],
 	data() {
 		return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
 			url: `${VUE_APP_API_URL}/upload/image`,
 			headers: {
 				Authorization: "Bearer " + this.$store.state.token

pages/order/OrderSubmission/index.vue

@@ -1,16 +1,15 @@
 <template>
   <view class="order-submission" style="padding: 30rpx;">
     <view class="allAddress" style="background-color: #f6f6f6;">
+
       <view
-        v-if="shipping_type === 0"
+          class="address acea-row v12-align-start"
-        class="address acea-row v12-align-start"
+          style="flex-wrap: nowrap;margin: 0 0 30rpx 0;border-radius: 16rpx;"
-        style="flex-wrap: nowrap;margin: 0 0 30rpx 0;border-radius: 16rpx;"
+          v-if="shipping_type === 0"
-        @click="addressTap"
+          @click="addressTap"
       >
-        <image
+        <image style="flex-shrink: 0;width: 36rpx;height: 36rpx;margin-right: 20rpx;"
-          :src="webUrl+'/orderIcon/map.png'"
+               :src="webUrl+'/orderIcon/map.png'" mode=""></image>
-          style="flex-shrink: 0;width: 36rpx;height: 36rpx;margin-right: 20rpx;"
-        />
         <view class="acea-row row-between-wrapper" style="flex-wrap: nowrap;flex-grow: 1;">
           <view class="addressCon" v-if="addressInfo.realName">
             <view class="more-t">
@@ -26,35 +25,32 @@
           </view>
         </view>
       </view>
-      <div
+      <div style="flex-wrap: nowrap;" class="address acea-row row-middle" v-else @click="showStoreList">
-        v-else
+
-        style="flex-wrap: nowrap;"
+        <image style="flex-shrink: 0;width: 48rpx;height: 48rpx;margin-right: 20rpx;"
-        class="address acea-row row-middle"
+               :src="webUrl+'/20230304135530688212.png'" mode=""></image>
-        @click="showStoreList"
-      >
-        <image
-          :src="webUrl+'/20230304135530688212.png'"
-          style="flex-shrink: 0;width: 48rpx;height: 48rpx;margin-right: 20rpx;"
-        />
         <view class="acea-row row-between-wrapper" style="flex-wrap: nowrap;flex-grow: 1;">
           <div class="addressCon">
             <div class="name">
               {{ isNullOrEmpty(storeItems) ? systemStore.name : storeItems.name }}
-              <span class="phone">{{ isNullOrEmpty(storeItems) ? systemStore.phone : storeItems.phone }}</span>
+              <span
+                  class="phone"
+              >{{ isNullOrEmpty(storeItems) ? systemStore.phone : storeItems.phone }}</span>
             </div>
             <div>{{ isNullOrEmpty(storeItems) ? systemStore.address : storeItems.address }}</div>
           </div>
           <div class="iconfont icon-jiantou"></div>
         </view>
+
       </div>
     </view>
-    <OrderGoods
+
-      :evaluate="0"
+    <OrderGoods :evaluate="0" :cartInfo="orderGroupInfo.cartInfo" title="商品信息"></OrderGoods>
-      :cartInfo="orderGroupInfo.cartInfo"
+
-      title="商品信息"
-    />
     <view class="wrapper" style="margin:0;border-radius:0 0 20rpx 20rpx">
-      <view v-if="shipping_type === 0" class="v12-pa-2 acea-row row-between-wrapper" style="flex-wrap: nowrap;">
+
+
+      <view class="v12-pa-2 acea-row row-between-wrapper" style="flex-wrap: nowrap;" v-if="shipping_type === 0">
         <view class="acea-row row-middle" style="flex-wrap: nowrap;">
           <!-- <image style="width: 32rpx;height: 32rpx;margin-right: 12rpx;" :src="webUrl+'/20210807230820761721.png'"
                  mode=""></image> -->
@@ -68,22 +64,13 @@
         <view class="v12-pa-2 acea-row row-between-wrapper">
           <view class="v12-font-24 v12-secondary-dark-text v12-pr-3 v12-text-right" style="width: 140rpx">联系人</view>
           <view class="discount">
-            <input
+            <input class="v12-font-24" type="text" placeholder="请填写您的联系姓名" v-model="contacts"/>
-              v-model="contacts"
-              class="v12-font-24"
-              type="text"
-              placeholder="请填写您的联系姓名"
-            />
           </view>
         </view>
         <view class="v12-pa-2 acea-row row-between-wrapper">
           <view class="v12-font-24  v12-secondary-dark-text v12-pr-3 v12-text-right" style="width: 140rpx">联系电话</view>
           <view class="discount">
-            <input
+            <input type="text" placeholder="请填写您的联系电话" v-model="contactsTel"/>
-              v-model="contactsTel"
-              type="text"
-              placeholder="请填写您的联系电话"
-            />
           </view>
         </view>
       </view>
@@ -93,11 +80,7 @@
                  mode=""></image> -->
           <text class="v12-font-24 v12-secondary-dark-text v12-pr-3 v12-text-right" style="width: 140rpx;">备注</text>
         </view>
-        <textarea
+        <textarea v-model="mark" placeholder="建议与商家协商一致" class="mark v12-font-24 "></textarea>
-          v-model="mark"
-          placeholder="建议与商家协商一致"
-          class="mark v12-font-24 "
-        />
       </view>
     </view>
     <!-- v12 -->
@@ -117,7 +100,7 @@
             <text class="v12-font-28">{{ force2Decimal(orderPrice.payPostage) }}</text>
           </view>
         </view> -->
-        <view v-if="!isLotteryOrder()" class="v12-justify-between v12-align-center  v12-py-1">
+        <view class="v12-justify-between v12-align-center  v12-py-1">
           <view class="v12-font-24 v12-dark-text v12-align-center">
             <text>优惠券</text>
             <view class="v12-align-center v12-ml-1" v-if="couponTitle">
@@ -130,7 +113,7 @@
               <text class="v12-dark-text v12-font-24" >{{ couponList.usable.length === 0 ? '无' : '去选择' }}</text>
               <text class="iconfont icon-jiantou v12-font-24 v12-dark-text"></text>
             </view> -->
-            <view class="v12-secondary-dark-text v12-align-center" @click="showCouponsPopup">
+            <view class="v12-secondary-dark-text v12-align-center" @click="changeCoupons">
               <text class="v12-font-22 ">-￥</text>
               <text class="v12-font-28">{{ force2Decimal(orderPrice.couponPrice) }}</text>
               <text class="iconfont icon-jiantou v12-font-24 v12-dark-text"></text>
@@ -197,11 +180,11 @@
         </view>
         <view class="list" style="margin-top: 0;">
           <view
-            v-show="isWeixin"
+              class="payItem acea-row row-middle"
-            :class="active === 'weixin' ? 'on' : ''"
+              :class="active === 'weixin' ? 'on' : ''"
-            class="payItem acea-row row-middle"
+              v-show="isWeixin"
-            style="flex-wrap: nowrap; margin-top: 0"
+              @click="payItem('weixin')"
-            @click="payItem('weixin')"
+              style="flex-wrap: nowrap; margin-top: 0"
           >
             <view class="name acea-row v12-font-24">
               <!-- <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view> -->
@@ -215,11 +198,11 @@
             </label>
           </view>
           <view
-            v-show="!isWeixin"
+              class="payItem acea-row row-middle"
-            :class="active === 'weixin' ? 'on' : ''"
+              :class="active === 'weixin' ? 'on' : ''"
-            class="payItem acea-row row-middle"
+              @click="payItem('weixin')"
-            style="flex-wrap: nowrap; margin-top: 20rpx"
+              v-show="!isWeixin"
-            @click="payItem('weixin')"
+              style="flex-wrap: nowrap; margin-top: 20rpx"
           >
             <view class="name acea-row  v12-font-24">
               <!-- <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view> -->
@@ -231,12 +214,13 @@
               <radio style="transform: scale(0.7);" value="" :checked="active === 'weixin'" color="#C52733"/>
               <text></text>
             </label>
+
           </view>
           <view
-            :class="active === 'yue' ? 'on' : ''"
+              class="payItem acea-row row-middle v12-justify-between"
-            class="payItem acea-row row-middle v12-justify-between"
+              :class="active === 'yue' ? 'on' : ''"
-            style="flex-wrap: nowrap;"
+              @click="payItem('yue')"
-            @click="payItem('yue')"
+              style="flex-wrap: nowrap;"
           >
             <view class="name acea-row  v12-font-24">
               <!-- <view style="background-color: #007AFF;" class="iconfont icon-icon-test"
@@ -249,31 +233,34 @@
               <radio style="transform: scale(0.7);" value="" :checked="active === 'yue'" color="#C52733"/>
               <text></text>
             </label>
+
           </view>
         </view>
       </view>
     </view>
+    
+
     <!-- v9 优惠券开始 -->
     <u-popup
-      v-if="!isLotteryOrder() && show"
       :show="show"
       :round="10"
       mode="bottom"
       close-on-click-overlay
-      @close="close"
+      @close="changeCoupons"
     >
       <CouponsPopup
-        v-if="!isLotteryOrder() && couponList.usable.length > 0 && show"
+        v-if="couponList.usable.length > 0"
         :two-list="couponList"
         @change="changeCoupons"
         @close="close"
         :currentPrice="force2Decimal(orderPrice.totalPrice)"
         :id="couponId"
-        :couponId1="couponId"
+        @max="couponMax"
         :show-tab="false"
       />
     </u-popup>
     <!-- v9 优惠券结束 -->
+
     <view style="height:80rpx"></view>
     <view class="footer v12-justify-end v12-px-3" style="height: 120rpx;">
       <view class="v12-align-center v12-px-4">
@@ -301,7 +288,6 @@
       @redirect="addressRedirect"
     />
     <passkeyborad
-      v-if="isShowPayPwdPop"
       ref='payPwdPop'
       showMoney
       :money="orderPrice.payPrice"
@@ -314,27 +300,19 @@
 
 <script>
 import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
-import OrderGoods from "@/components/OrderGoods"
+import OrderGoods from "@/components/OrderGoods";
-import AddressWindow from "@/components/AddressWindow"
+import AddressWindow from "@/components/AddressWindow";
-import {
+import {createOrder, postOrderComputed, postOrderConfirm} from "@/api/order";
-  createOrder,
+import {mapGetters} from "vuex";
-  postOrderComputed,
+import {weappPay} from "@/libs/wechat";
-  postOrderConfirm,
+import {isNullOrEmpty, isWeixin} from "@/utils";
-  getAddressDefaultSelected
+import blPaymentPasswordInput from '@/components/blPaymentPasswordInput.vue';
-} from "@/api/order"
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import {mapGetters} from "vuex"
-import {weappPay} from "@/libs/wechat"
-import {isNullOrEmpty, isWeixin} from "@/utils"
-import blPaymentPasswordInput from '@/components/blPaymentPasswordInput.vue'
-import uniPopup from '@/components/uni-popup/uni-popup.vue'
 import CouponsPopup from "@/components/CouponsPopup.vue"
-import { getDrawTicketByOrder } from '@/api/lottery'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
-import settings from '@/config/baseSetting.js'
-import { orderPaySuccessToCheckDrawStatus } from '@/mixins/orderPaySuccessToCheckDrawStatus.js'
 
-const NAME = "OrderSubmission"
+const NAME = "OrderSubmission",
-const _isWeixin = isWeixin()
+    _isWeixin = isWeixin();
 export default {
   name: NAME,
   components: {
@@ -345,7 +323,7 @@ export default {
     passkeyborad,
     CouponsPopup
   },
-  mixins: [pageListenMixins, orderPaySuccessToCheckDrawStatus],
+  mixins: [pageListenMixins],
   props: {},
   data: function () {
     return {
@@ -384,7 +362,7 @@ export default {
         unusable: [],
         usable: []
       },
-      couponId: null,
+      couponId: uni.getStorageSync('couponId') || 0,
       couponIndex: -1,
       show: false,
       // 是否使用积分开关
@@ -398,16 +376,16 @@ export default {
       pageKeyId: Object.freeze('orderConfirm'),
       total: 0,
       couponTitle: '',
-      hasCoupon: false
+      hasCoupon: false,
-    }
+    };
   },
   computed: mapGetters(["userInfo", "storeItems"]),
   watch: {
     useIntegral() {
-      this.computedPrice('useIntegral')
+      this.computedPrice('useIntegral');
     },
     shipping_type() {
-      this.computedPrice('shipping_type')
+      this.computedPrice('shipping_type');
     },
     async couponId(value) {
       this.couponIndex = this.couponList['usable']?.findIndex(item => item.id === +value)
@@ -416,6 +394,7 @@ export default {
     }
   },
   onLoad(opts) {
+    console.log(opts);
     const that = this
     if (that.$yroute.query.pinkid !== undefined) {
       that.pinkId = that.$yroute.query.pinkid
@@ -428,104 +407,61 @@ export default {
       that.lotteryRecordId = that.$yroute.query.lotteryRecordId
     }
     that.hasCoupon = opts.couponId !== ''
-    that.getCartInfo()
   },
   onShow() {
     const _this = this
+    _this.getCartInfo()
     //获取用户信息
     _this.$store.dispatch("getUser", true)
-    // 监听到选择收货地址
+    
-    const chooseAddress = uni.getStorageSync('chooseAddress') || {}
-    // const sourceAddress = uni.getStorageSync('sourceAddress') || {}
-    // 监听到选择收货地址
-    if (chooseAddress.id) {
-      _this.addressInfo = chooseAddress
-      // 地址切换也要重新计算一下
-      // uni.setStorageSync('sourceAddress', _this.addressInfo || '')
-      uni.setStorageSync('sourceAddress', {})
-      _this.computedPrice('onLoad chooseAddress')
-      setTimeout(() => {
-        uni.hideLoading()
-        uni.setStorageSync('chooseAddress', {})
-      }, 1000)
-    }
   },
   methods: {
     isNullOrEmpty,
-    isLotteryOrder() {
-      const cartInfo = Array.isArray(this.orderGroupInfo && this.orderGroupInfo.cartInfo)
-        ? this.orderGroupInfo.cartInfo
-        : []
-      return Boolean(
-        this.lotteryRecordId ||
-        this.$yroute.query.from === 'countyLottery' ||
-        Number(this.$yroute.query.drawActivityId || 0) > 0 ||
-        cartInfo.some(item => Number(
-          item.drawActivityId ||
-          (item.productInfo && item.productInfo.drawActivityId) ||
-          0
-        ) > 0)
-      )
-    },
-    getOrderCouponId() {
-      if (this.isLotteryOrder()) return 0
-      return this.couponList.usable.length === 0 ? 0 : (this.couponId || 0)
-    },
     couponMax(e) {
-      // this.couponTitle = e.couponTitle
+      this.couponTitle = e.couponTitle
-      // this.couponId = this.$yroute.query.couponId ||  uni.getStorageSync('couponId') || 0
+      this.couponId = this.$yroute.query.couponId ||  uni.getStorageSync('couponId') || 0
     },
     showStoreList() {
-      this.$store.commit("get_to", "orders")
+      this.$store.commit("get_to", "orders");
       this.$yrouter.push({
-        path: "/pagesShop/shop/StoreList/index"
+        path: "/pages/shop/StoreList/index"
-      })
+      });
     },
     force2Decimal(value) {
-      return this.$force2Decimal(value)
+      return this.$force2Decimal(value);
     },
     usePointsCheckChange(e) {
       this.computedPrice()
     },
-    
+    // 计算订单金额
-    /**
-     * 计算订单金额
-     * @param {*} f 有值时 couponId不取默认值
-     */
     computedPrice(f) {
+      let shipping_type = this.shipping_type;
       postOrderComputed(this.orderGroupInfo.orderKey, {
         addressId: this.addressInfo.id,
         useIntegral: this.useIntegral ? 1 : 0,
-        couponId: this.getOrderCouponId(),
+        couponId: this.couponList.usable.length === 0 ? 0 : this.couponId || 0,
         usePoints: this.usePointsCheck ? 1 : 0,
-        shipping_type: parseInt(this.shipping_type) + 1
+        shipping_type: parseInt(shipping_type) + 1
       }).then(res => {
-        this.couponList = res.data.result.couponList
-        if (this.isLotteryOrder()) {
-          this.couponTitle = ''
-          if (this.couponId !== 0) {
-            this.couponId = 0
-          }
-        } else if(!f) {
-          this.couponId = res.data.result.defaultCouponId
-        }
         const data = res.data;
         if (data.status === "EXTEND_ORDER") {
           this.$yrouter.replace({
-            path: "/pagesOrder/order/OrderDetails/index",
+            path: "/pages/order/OrderDetails/index",
             query: {
               id: data.result.orderId
             }
-          })
+          });
         } else {
           this.orderPrice = data.result;
+          console.log(this.orderPrice);
+          
           if (this.usePointsCheck) {
             this.usePointsNumber = data.result.usedPoints
           } else {
             this.usePointsNumber = 0
           }
         }
-      })
+      });
     },
     getCartInfo() {
       const _this = this
@@ -565,18 +501,38 @@ export default {
           _this.usePointsCheck = true
           _this.usePointsNumber = data.maxPoints
         }
-        _this.systemStore = data.systemStore || {}
-        _this.storeSelfMention = data.storeSelfMention
         if(_this.$yroute.query.address !== undefined ) {
           _this.addressInfo =  JSON.parse(_this.$yroute.query.address) || {}
-          _this.computedPrice()
         } else {
-          // _this.addressInfo = uni.getStorageSync('sourceAddress') || data.addressInfo || {}
+          _this.addressInfo = uni.getStorageSync('chooseAddress') ? uni.getStorageSync('chooseAddress') : data.addressInfo || {}
-          getAddressDefaultSelected().then(res => {
+        }
-            _this.addressInfo = res.data
+        const chooseAddress = uni.getStorageSync('chooseAddress') || {}
-            _this.computedPrice()
+        const sourceAddress = uni.getStorageSync('sourceAddress') || data.addressInfo || uni.getStorageSync('chooseAddress') 
+        // 监听到选择收货地址
+        if (chooseAddress.id && (chooseAddress.id !== sourceAddress.id)) {
+          uni.showModal({
+            title:'确定修改地址吗?',
+            content: '',
+            showCancel: true,
+            cancelText: '取消',
+            confirmText: '确认',
+            success: (res) => {
+              if(res.confirm) {
+                _this.addressInfo = chooseAddress
+                // 地址切换也要重新计算一下
+                uni.setStorageSync('sourceAddress', _this.addressInfo || '')
+                _this.computedPrice('onLoad chooseAddress')
+              }
+            },
+            complete: () => {
+              uni.hideLoading()
+              // uni.setStorageSync('chooseAddress', {})
+            }
           })
         }
+        _this.systemStore = data.systemStore || {}
+        _this.storeSelfMention = data.storeSelfMention
+        _this.computedPrice()
       }).catch(err => {
         uni.showToast({
           title: err.msg,
@@ -586,33 +542,32 @@ export default {
       })
     },
     addressTap: function () {
-      uni.setStorageSync('sourceAddress', this.addressInfo)
+      //改用跳转页面方式
-      // 改用跳转页面方式
       this.$yrouter.push({
         path: "/pages/user/address/AddressManagement/index",
         query: {
           choosMode: 1
         }
-      })
+      });
     },
     addressRedirect() {
-      this.addressLoaded = false
+      this.addressLoaded = false;
-      this.showAddress = false
+      this.showAddress = false;
     },
     payItem: function (index) {
-      this.active = index
+      this.active = index;
     },
     changeAddress(addressInfo) {
-      this.addressInfo = addressInfo
+      this.addressInfo = addressInfo;
       //地址切换也要重新计算一下
-      this.computedPrice('changeAddress')
+      this.computedPrice('changeAddress');
     },
     pwdPopClose() {
-      this.isShowPayPwdPop = false
+      this.isShowPayPwdPop = false;
     },
     pwdPopFinish(payPwd) {
-      this.payPassword = payPwd
+      this.payPassword = payPwd;
-      this.createOrder(true)
+      this.createOrder(true);
     },
     //支付密码输入监听
     onInput(e) {
@@ -620,52 +575,55 @@ export default {
     },
     // 支付密码输入确认
     onConfirm(e) {
-      this.payPassword = e.value
+      this.payPassword = e.value;
-      this.$refs.popup.close()
+      this.$refs.popup.close();//关闭支付密码弹窗
-      this.$refs.secrity.clear()
+      this.$refs.secrity.clear();//清空支付密码
-      this.createOrder(true)
+      this.createOrder(true);
     },
     subscribePay() {
       uni.requestSubscribeMessage({
-        tmplIds: settings.SubscribeMessageTmplIds,
+        tmplIds: ['7O3wKw7_D4t7yfSOlvecKuOQP8QEPY88uBx2FJg43HE', 'TSmTnGibZ8IxWCiRWOvLxha6-0u7tE-V1-WbDCiPkKU', '9Q6xLHe6HyjkU5Zn5k_2zxYPf2y4MxVyUbOSW8pcZRU'],
         complete: () => this.createOrder(false)
       })
     },
     createOrder(isyue) {
+      let shipping_type = this.shipping_type;
       if (!this.active) {
         uni.showToast({
           title: "请选择支付方式",
           icon: "none",
           duration: 2000
-        })
+        });
-        return
+        return;
       }
       if (!this.addressInfo.id && !this.shipping_type) {
         uni.showToast({
           title: "请选择收货地址",
           icon: "none",
           duration: 2000
-        })
+        });
-        return
+        return;
       }
+
       if (this.shipping_type) {
         if (
-          (this.contacts === "" || this.contactsTel === "") &&
+            (this.contacts === "" || this.contactsTel === "") &&
-          this.shipping_type
+            this.shipping_type
         ) {
           uni.showToast({
             title: "请填写联系人或联系人电话",
             icon: "none",
             duration: 2000
-          })
+          });
           return;
         }
+
         if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(this.contactsTel)) {
           uni.showToast({
             title: "请填写正确的手机号",
             icon: "none",
             duration: 2000
-          })
+          });
           return;
         }
         if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(this.contacts)) {
@@ -673,41 +631,46 @@ export default {
             title: "请填写您的真实姓名",
             icon: "none",
             duration: 2000
-          })
+          });
-          return
+          return;
         }
       }
-      // 判断如果是余额支付，先要输入支付密码
+
+      //判断如果是余额支付，先要输入支付密码
       if (this.active == 'yue' && !isyue) {
-        // 先判断用户是否绑定过手机
+        //先判断用户是否绑定过手机
         if (this.userInfo.phone) {
-          // 再判断用户是否设置过支付密码
+          //再判断用户是否设置过支付密码
           if (this.userInfo.hasPwdPay) {
-            // 显示输入支付密码
+            //显示输入支付密码
-            this.isShowPayPwdPop = true
+            this.isShowPayPwdPop = true;
           } else {
-            // 设置支付密码
+            //设置支付密码
-            this.$yrouter.push("/pkg_user/views/payPassword?isSetMode=true")
+            this.$yrouter.push("/pkg_user/views/payPassword?isSetMode=true");
           }
         } else {
-          // 跳转到绑定手机
+          //跳转到绑定手机
-          this.$yrouter.push("/pkg_user/views/bindPhone")
+          this.$yrouter.push("/pkg_user/views/bindPhone");
         }
-        return
+
+        return;
       }
+
       uni.showLoading({
         title: "生成订单中"
-      })
+      });
-      let from = {}
+      let from = {};
       if (this.$deviceType == "app") {
-        from.from = "app"
+        from.from = "app";
       }
-      const params = {
+      console.log(this.storeItems, this.systemStore);
+
+      var params = {
         realName: this.contacts,
         phone: this.contactsTel,
         addressId: this.addressInfo.id,
         useIntegral: this.useIntegral ? 1 : 0,
-        couponId: this.getOrderCouponId(),
+        couponId: this.couponList.usable.length === 0 ? 0 : this.couponId || 0,
         usePoints: this.usePointsNumber || 0,
         payType: this.active,
         pinkId: this.pinkId,
@@ -716,147 +679,131 @@ export default {
         bargainId: this.orderGroupInfo.bargain_id,
         from: this.from,
         mark: this.mark || "",
-        shippingType: parseInt(this.shipping_type) + 1,
+        shippingType: parseInt(shipping_type) + 1,
         storeId: this.storeItems ? this.storeItems.id : this.systemStore.id,
         ...from
       }
-      uni.setStorageSync('chooseAddress', {})
+
       //余额支付的支付密码
       if (this.active == 'yue') {
-        params.passwordPay = this.payPassword
+        params.passwordPay = this.payPassword;
       }
       uni.removeStorageSync('couponId')
-      var that = this
+
-      createOrder(this.orderGroupInfo.orderKey, params).then(res => {
+      var that = this;
-        uni.hideLoading()
+      createOrder(this.orderGroupInfo.orderKey, params)
-        const data = res.data
+          .then(res => {
-        const orderId = data && data.result ? data.result.orderId : ''
+            uni.hideLoading();
-        switch (data.status) {
+            const data = res.data;
-          case "ORDER_EXIST":
+            switch (data.status) {
-          case "EXTEND_ORDER":
+              case "ORDER_EXIST":
-            uni.showToast({
+              case "EXTEND_ORDER":
-              title: res.msg,
+                uni.showToast({
-              icon: "none",
+                  title: res.msg,
-              duration: 2000
+                  icon: "none",
-            })
+                  duration: 2000
-            this.$yrouter.replace({
+                });
-              path: "/pagesOrder/order/OrderDetails/index",
+                this.$yrouter.replace({
-              query: {
+                  path: "/pages/order/OrderDetails/index",
-                id: orderId
+                  query: {
-              }
+                    id: data.result.orderId
-            })
+                  }
-            break;
+                });
-          case "PAY_DEFICIENCY":
+                break;
-            break;
+              case "PAY_DEFICIENCY":
-          case "PAY_ERROR":
+                break;
-            uni.showToast({
+
-              title: res.msg,
+              case "PAY_ERROR":
-              icon: "none",
+                uni.showToast({
-              duration: 2000
+                  title: res.msg,
-            })
+                  icon: "none",
-            this.$yrouter.replace({
+                  duration: 2000
-              path: "/pages/order/MyOrder/index",
+                });
-              query: {
+                this.$yrouter.replace({
-                type: 1
+                  path: "/pages/order/OrderDetails/index",
-              }
+                  query: {
-            });
+                    id: data.result.orderId
-            break;
+                  }
-          case "SUCCESS":
+                });
-            uni.showToast({
+                break;
-              title: res.msg,
+              case "SUCCESS":
-              icon: "none",
+                uni.showToast({
-              duration: 2000
+                  title: res.msg,
-            })
+                  icon: "none",
-            this.paySuccessToMyOrderOrDetail(orderId)
+                  duration: 2000
-            break;
+                });
-          case "WECHAT_H5_PAY":
+                this.$yrouter.replace({
-            // H5支付
+                  path: "/pages/order/OrderDetails/index",
-            this.$yrouter.replace({
+                  query: {
-              path: "/pages/order/MyOrder/index",
+                    id: data.result.orderId
-              query: {
+                  }
-                type: 1
+                });
-              }
+                break;
-            })
+              case "WECHAT_H5_PAY":
-            break;
+                // H5支付
-          case "WECHAT_PAY":
+                this.$yrouter.replace({
-            // 小程序支付
+                  path: "/pages/order/OrderDetails/index",
-            weappPay(data.result.jsConfig).then(() => {
+                  query: {
-              this.paySuccessToMyOrderOrDetail(orderId)
+                    id: data.result.orderId
-            }).catch(() => {
+                  }
-              this.paySuccessToMyOrderOrDetail(orderId)
+                });
-            })
+                setTimeout(() => {
-            break;
+                  // location.href = data.result.jsConfig.mweb_url;
-          case "WECHAT_APP_PAY":
+                }, 100);
-            // APP支付
+                break;
-            weappPay(data.result.jsConfig).then(() => {
+              case "WECHAT_PAY":
-              this.paySuccessToMyOrderOrDetail(orderId)
+                // 小程序支付
-            }).catch(() => {
+                weappPay(data.result.jsConfig).finally(() => {
-              this.paySuccessToMyOrderOrDetail(orderId)
+                  this.$yrouter.replace({
-            })
+                    path: "/pages/order/OrderDetails/index",
-            break;
+                    query: {
-        }
+                      id: data.result.orderId
-      }).catch(err => {
+                    }
-        uni.hideLoading()
+                  });
-        uni.showToast({
+                });
-          title: err.msg ||
+                break;
-            err.response.data.msg ||
+
-            err.response.data.message ||
+              case "WECHAT_APP_PAY":
-            "创建订单失败",
+                // APP支付
-          icon: "none",
+                weappPay(data.result.jsConfig).finally(() => {
-          duration: 2000
+                  this.$yrouter.replace({
-        })
+                    path: "/pages/order/OrderDetails/index",
-      }).finally(function () {
+                    query: {
-        if (that.$refs.payPwdPop) {
+                      id: data.result.orderId
-          that.$refs.payPwdPop.clear()
+                    }
-          that.$refs.payPwdPop.close()
+                  });
-        }
+                });
-        that.isShowPayPwdPop = false
+                break;
-      })
-    },
-    paySuccessToMyOrderOrDetail(orderId) {
-      this.afterPaySuccess(orderId, (drawTicketResult) => {
-        if (this.orderGroupInfo.cartInfo && this.orderGroupInfo.cartInfo.length === 1) {
-          this.$yrouter.replace({
-            path: "/pagesOrder/order/OrderDetails/index",
-            query: this.buildOrderDetailQuery(orderId, drawTicketResult)
-          })
-        } else {
-          this.$yrouter.replace({
-            path: "/pages/order/MyOrder/index",
-            query: {
-              type: 2,
-              query: this.buildOrderDetailQuery(orderId, drawTicketResult)
             }
           })
-        }
+          .catch(err => {
-      })
+            uni.hideLoading();
+            uni.showToast({
+              title:
+                  err.msg ||
+                  err.response.data.msg ||
+                  err.response.data.message ||
+                  "创建订单失败",
+              icon: "none",
+              duration: 2000
+            });
+          }).finally(function () {
+        that.isShowPayPwdPop = false;
+        that.$refs.payPwdPop.clear();//清空支付密码
+        that.$refs.payPwdPop.close();//关闭支付密码弹窗
+      });
     },
     close() {
       this.show = !this.show
     },
-    showCouponsPopup() { 
-      if (this.isLotteryOrder()) return
-      if (this.couponList.usable.length === 0) return
-      this.show = !this.show
-    },
     // v9-2
     changeCoupons(item) {
-      if (this.isLotteryOrder()) return
       if(!item) return
       if (this.couponList.usable.length === 0) return
       this.show = !this.show
-      if(!item.id) {
+      this.couponId = uni.getStorageSync('couponId') || 0
-        this.couponId = 0
-        this.couponTitle = ''
-        this.computedPrice(1)
-        return
-      }
-      this.couponId = item.id
       this.couponTitle = item.couponTitle
-      this.computedPrice(1)
+    },
-      // this.couponId = uni.getStorageSync('couponId') || 0
-      // this.couponTitle = item.couponTitle
-    }
   }
 };
 </script>
@@ -1033,5 +980,4 @@ export default {
   padding: 20rpx 0 0 0;
   color: #999;
 }
-
 </style>

pages/order/PaymentStatus/index.vue

@@ -0,0 +1,34 @@
+<template>
+  <view class="payment-status">
+    <!--失败时： 用icon-iconfontguanbi fail替换icon-duihao2 bg-color-red-->
+    <view class="iconfont icon-duihao2 bg-color-red"></view>
+    <!-- 失败时：订单支付失败 -->
+    <view class="status">订单支付成功</view>
+    <view class="wrapper">
+      <view class="item acea-row row-between-wrapper">
+        <view>订单编号</view>
+        <view class="itemCom">wx3265361456134568</view>
+      </view>
+      <view class="item acea-row row-between-wrapper">
+        <view>下单时间</view>
+        <view class="itemCom">2019-01-09 18:05</view>
+      </view>
+      <view class="item acea-row row-between-wrapper">
+        <view>支付方式</view>
+        <view class="itemCom">微信支付</view>
+      </view>
+      <view class="item acea-row row-between-wrapper">
+        <view>支付金额</view>
+        <view class="itemCom">2222.00</view>
+      </view>
+      <!--失败时加上这个  -->
+      <!--<view class='item acea-row row-between-wrapper'>-->
+      <!--<view>失败原因</view>-->
+      <!--<view class='itemCom'>账户余额不足</view>-->
+      <!--</view>-->
+    </view>
+    <!--失败时： 重新购买 -->
+    <view class="returnBnt bg-color-red">返回查看订单</view>
+    <view class="returnBnt cart-color">返回首页</view>
+  </view>
+</template>

pages/order/ReturnList/index.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="return-list" ref="container">
     <view class="goodWrapper" v-for="(order,orderListIndex) in orderList" :key="orderListIndex">
-      <view class="iconfont icon-tuikuanzhong powder" v-if="parseInt(order._status._type) === -1"></view>
+      <view class="iconfont icon-tuikuanzhong powder" v-if="order._status._type === '-1'"></view>
-      <view class="iconfont icon-yituikuan" v-if="parseInt(order._status._type) === -2"></view>
+      <view class="iconfont icon-yituikuan" v-if="order._status._type === '-2'"></view>
-      <image class="iconfont" :src="webUrl+'/20230713110051999762.png'" v-if="parseInt(order._status._type) === -3"/>
+      <image class="iconfont" :src="webUrl+'/20230713110051999762.png'" v-if="order._status._type === '-3'"/>
       <view class="orderNum">订单号：{{ order.orderId }}</view>
       <view
           class="item acea-row row-between-wrapper"
@@ -76,7 +76,7 @@ export default {
     },
     goOrderDetails(order) {
       this.$yrouter.push({
-        path: "/pagesOrder/order/OrderDetails/index",
+        path: "/pages/order/OrderDetails/index",
         query: {id: order.orderId}
       });
     },

pages/shop/EvaluateList/index.vue

@@ -0,0 +1,115 @@
+<template>
+  <view class="evaluate-list" ref="container">
+    <view class="header">
+      <view class="generalComment acea-row row-between-wrapper">
+        <view class="acea-row row-middle font-color-red">
+          <text class="evaluate">评分</text>
+          <view class="start" :class="'star' + replyData.replyStar"></view>
+        </view>
+        <view>
+          <text class="font-color-red">{{ replyData.replyChance || 0 }}%</text>
+		  <text>好评率</text>
+        </view>
+      </view>
+      <view class="nav acea-row row-middle">
+        <view
+          class="acea-row row-center-wrapper"
+          v-for="(item, navListIndex) in navList"
+          :key="navListIndex"
+          @click="changeType(navListIndex)"
+        >
+          <view
+            class="item"
+            :class="currentActive === navListIndex ? 'bg-color-red' : ''"
+            v-if="item.num"
+          >
+		  <text>{{ item.evaluate }}({{ item.num }})</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <UserEvaluation :reply="reply"></UserEvaluation>
+    <Loading :loaded="loadend" :loading="loading"></Loading>
+  </view>
+</template>
+<script>
+import UserEvaluation from "@/components/UserEvaluation";
+import { getReplyConfig, getReplyList } from "@/api/store";
+import Loading from "@/components/Loading";
+
+export default {
+  name: "EvaluateList",
+  components: {
+    UserEvaluation,
+    Loading
+  },
+  props: {},
+  data: function() {
+    return {
+      product_id: 0,
+      replyData: {},
+      navList: [
+        { evaluate: "全部", num: 0 },
+        { evaluate: "好评", num: 0 },
+        { evaluate: "中评", num: 0 },
+        { evaluate: "差评", num: 0 }
+      ],
+      currentActive: 0,
+      page: 1,
+      limit: 8,
+      reply: [],
+      loadTitle: "",
+      loading: false,
+      loadend: false
+    };
+  },
+  mounted: function() {
+    this.product_id = this.$yroute.query.id;
+    this.getProductReplyCount();
+    this.getProductReplyList();
+  },
+  onReachBottom() {
+    !this.loading && this.getProductReplyList();
+  },
+  methods: {
+    getProductReplyCount: function() {
+      let that = this;
+      getReplyConfig(that.product_id).then(res => {
+        that.$set(that, "replyData", res.data);
+        that.navList[0].num = res.data.sumCount;
+        that.navList[1].num = res.data.goodCount;
+        that.navList[2].num = res.data.inCount;
+        that.navList[3].num = res.data.poorCount;
+      });
+    },
+    getProductReplyList: function() {
+      let that = this;
+      if (that.loading) return; //阻止下次请求（false可以进行请求）；
+      if (that.loadend) return; //阻止结束当前请求（false可以进行请求）；
+      that.loading = true;
+      let q = { page: that.page, limit: that.limit, type: that.currentActive };
+      getReplyList(that.product_id, q).then(res => {
+        that.loading = false;
+        //apply();js将一个数组插入另一个数组;
+        that.reply.push.apply(that.reply, res.data);
+        that.loadend = res.data.length < that.limit; //判断所有数据是否加载完成；
+        that.page = that.page + 1;
+      });
+    },
+    changeType: function(index) {
+      let that = this;
+      that.currentActive = index;
+      that.page = 1;
+      that.loadend = false;
+      that.$set(that, "reply", []);
+      that.getProductReplyList();
+    }
+  }
+};
+</script>
+<style scoped lang="less">
+.noCommodity {
+  height: 8*100rpx;
+  background-color: #fff;
+}
+</style>

pages/shop/GoodSearch/index.vue

@@ -252,8 +252,7 @@ export default {
     setHistory(word) {
       const index = this.historyKey.findIndex(item => item.word === word)
       if (index > -1) {
-        this.historyKey.splice(index, 1)
+        return
-        // return
       }
       this.historyKey.unshift({id: this.$global.generateMixed(10), word })
       uni.setStorageSync('historyKey', JSON.stringify(this.historyKey))

pages/shop/GoodsCon/index.vue

@@ -73,12 +73,11 @@
             :style="giftBg ? 'background: url(' + giftBg + ') no-repeat center/cover' : ''"
             :class="giftBg ? '' : 'v12-primary'"
           >
-            <text v-if="storeInfo.discount > 0" class="v12-font-28 v12-yellow-text ll-text">平台限时补贴{{ storeInfo.discount }}折</text>
             <view class="v12-font-28 v12-align-center" style="height: 74rpx; opacity: 0;">
               <image class="gift-img" :src="webUrl + '/orderIcon/gift.png'" mode="widthFix" ></image>
               支持礼包赠送
             </view>
-            <view @click="toGift" class="v12-white v12-dark-text v12-radius-20 v12-font-28 gift-btn" v-if="!giftBg">
+            <view @click="toGift" class="v12-white v12-dark-text v12-radius-20 v12-font-28 gift-btn" style="opacity: 0;">
               送给朋友
             </view>
           </view>
@@ -207,8 +206,7 @@
             @ok="setCoupon" 
             @change="changeCoupons" 
             @close="changeCoupons()" 
-            :showTab="false"
+            :showTab="false" 
-            :showRadio="false"
             :currentPrice="storeInfo.price" />
         </u-popup>
         <!-- v9 优惠券结束 -->
@@ -275,9 +273,6 @@
                     <image class="logo" :src="webUrl+'/orderIcon/地址.png'" mode="" style="margin-right:0; width: 32rpx; height:32rpx;  opacity: 0;"/>
                     <text v-if="storeInfo.isFastPost == 1">预计48小时内发货</text>
                     <text v-if="storeInfo.isFastPost == 2">预计72小时内发货</text>
-                    <text v-if="storeInfo.isFastPost == 3">预计24小时内发货</text>
-                    <text v-if="storeInfo.isFastPost == 4">预计7天内发货</text>
-                    <text v-if="storeInfo.isFastPost == 5">预计15天内发货</text>
                     <text v-if="storeInfo.isFastPost == 0">{{ "预计发货时间：" + storeInfo.postTime }}</text>
                   </view>
                 </view>
@@ -493,7 +488,6 @@
           ref="attrWindow"
           :attr="attr"
           :cartNum="cart_num"
-          :hideQuantityControls="source === 'countyLottery' && Number(activityId) > 0"
           @changeFun="changeFun"
           :isNegotiable="storeInfo.isNegotiable === 1"
           @gift="gift"
@@ -660,10 +654,6 @@ export default {
   },
   computed: mapGetters(['isLogin', 'location', 'userInfo']),
   onShareAppMessage() {
-    uni.updateShareMenu({ 
-      isPrivateMessage: false,
-      withShareTicket: false
-    })
     return new Promise(async (resolve, reject) => {
       let result;
       let params = `?id=${this.id}&partnerId=${this.userInfo.uid}`
@@ -689,43 +679,6 @@ export default {
       }
     })
   },
-  onShareTimeline() {
-    uni.updateShareMenu({ 
-      isPrivateMessage: false,
-      withShareTicket: false
-    })
-    const storeName = this.storeInfo.storeName
-    const promise = new Promise(async (resolve, reject) => {
-      let result = null
-      let query = `id=${this.id}&partnerId=${this.userInfo.uid}`
-      if (this.source === 'famous') {
-        result = await famousGoodsShareImage(this.id)
-      }
-      if (this.source === 'kill') {
-        result = await secKillGoodsShareImage(this.activityId)
-        query += `&activityId=${this.activityId}`
-      }
-      if (result && result.status === 200) {
-        resolve({
-          title: storeName,
-          query,
-          imageUrl: result.data
-        })
-      } else {
-        resolve({
-          title: storeName,
-          query,
-          imageUrl: this.storeInfo.image
-        })
-      }
-    })
-    return {
-      title: storeName,
-      query: `id=${this.id}&partnerId=${this.userInfo.uid}`,
-      imageUrl: this.storeInfo.image,
-      promise
-    }
-  },
   onLoad(options) {
     // test data
     console.log("getLaunchOptionsSync", uni.getLaunchOptionsSync())
@@ -902,18 +855,17 @@ export default {
       })
     },
     async getMapData() {
-      const location = uni.getStorageSync('location')
+      let location = uni.getStorageSync('location')
       if (location.length === 0) {
         const map = await getLocation()
         if (map.length > 1) {
           const {latitude, longitude} = map[1]
-          getCurAddress(latitude, longitude, address => {
+          let address = await getCurAddress(latitude, longitude)
-            this.postAddress = address.formattedAddress
+          address = address[1].data.result.ad_info
-          })
+          location = address.province + address.city + address.district
         }
-      } else {
-        this.postAddress = location
       }
+      this.postAddress = location
     },
     // 获取当前位置经纬度
     handleLoacation(toast) {
@@ -925,9 +877,9 @@ export default {
           const map = await getLocation();
           if (map.length > 1) {
             const {latitude, longitude} = map[1]
-            getCurAddress(latitude, longitude, address => {
+            let address = await getCurAddress(latitude, longitude)
-              that.postAddress = address.formattedAddress
+            address = address[1].data.result.ad_info
-            })
+            that.postAddress = address.province + address.city + address.district
           }
         },
         fail: err => {
@@ -1071,12 +1023,12 @@ export default {
     },
     goStoreList() {
       this.$yrouter.push({
-        path: '/pagesShop/shop/StoreList/index'
+        path: '/pages/shop/StoreList/index'
       })
     },
     goEvaluateList(id) {
       this.$yrouter.push({
-        path: '/pagesShop/shop/EvaluateList/index',
+        path: '/pages/shop/EvaluateList/index',
         query: {
           id
         }
@@ -1496,9 +1448,6 @@ export default {
         case "day":
           q.dailyGoodsId = Number(this.activityId)
           break
-        case "countyLottery":
-          q.drawActivityId = Number(this.activityId || 0)
-          break
       }
       postCartAdd(q).then(function (res) {
         that.isOpen = false
@@ -1508,24 +1457,15 @@ export default {
             path: "/pages/order/OrderSubmission/index",
             query: {
               id: res.data.cartId,
-              discount: that.storeInfo.discount,
+              couponId: that.couponId // 优惠券ID
             }
           })
           return
         } 
         if(news === 2) {
           const coupId = that.couponId ? that.couponId : (that.couponList.usable[0] && that.couponList.usable[0].id || '')
-          let giftUrl = '/pkg_user/views/gift/gift?cartId=' + res.data.cartId
-          if (that.storeInfo.discount) {
-            giftUrl += '&discount=' + that.storeInfo.discount
-          }
-          if (that.source === 'countyLottery') {
-            giftUrl += '&from=countyLottery'
-            giftUrl += '&drawActivityId=' + Number(that.activityId || 0)
-          }
           uni.navigateTo({
-            // + '&couponId=' + coupId
+            url: '/pkg_user/views/gift/gift?cartId=' + res.data.cartId + '&couponId=' + coupId
-            url: giftUrl
           })
         }
         if(news === 0) {
@@ -1886,8 +1826,7 @@ export default {
   }
 
   .btn-buy-disabled {
-    background: #9D9D9D !important;
+    background: #9D9D9D;
-    color: #FFFFFF !important;
   }
 }
 
@@ -2115,7 +2054,6 @@ export default {
 .product-con .footer{
   height: 140rpx !important;
   padding-bottom: 20rpx;
-  // z-index: 1002 !important;
 }
 .product-con .product-intro .conter view {
   width: 100% !important;
@@ -2243,48 +2181,4 @@ export default {
   left: 0;
   width: 100%;
 }
-.ll-text{
-  margin-left: 250rpx;
-  word-break: keep-all;
-}
-</style>
-}
-.gift-wrap{
-  position: relative;
-}
-.gift-bg{
-  position: absolute;
-  left: 0;
-  width: 100%;
-}
-.ll-text{
-  margin-left: 250rpx;
-  word-break: keep-all;
-}
-</style>
-.gift-img{
-  width: 34rpx;
-  height: 34rpx;
-  margin-right: 10rpx;
-}
-.gift-wrap{
-  position: relative;
-}
-.gift-bg{
-  position: absolute;
-  left: 0;
-  width: 100%;
-}
-.ll-text{
-  margin-left: 250rpx;
-  word-break: keep-all;
-}
-</style>
-  left: 0;
-  width: 100%;
-}
-.ll-text{
-  margin-left: 250rpx;
-  word-break: keep-all;
-}
 </style>

pages/shop/GoodsEvaluate/index.vue

@@ -1,22 +1,7 @@
 <template>
   <view class="evaluate-con">
     <view
-      v-if="isTravelGroup && travelOrderInfo && travelOrderInfo.travelGroupOrderInfo && travelOrderInfo.travelGroupOrderInfo.travelGroupProduct"
+      v-if="orderCon.productInfo"
-      class="goodsStyle acea-row row-between"
-    >
-      <view class="pictrue">
-        <image :src="travelOrderInfo.travelGroupOrderInfo.travelGroupProduct.mainImage" class="image"/>
-      </view>
-      <view class="text acea-row row-between">
-        <view class="name line2">{{ travelOrderInfo.travelGroupOrderInfo.travelGroupProduct.name }}</view>
-        <view class="money">
-          <view>￥{{ travelOrderInfo.travelGroupOrderInfo.travelGroupProduct.price }}</view>
-          <view class="num">x1</view>
-        </view>
-      </view>
-    </view>
-    <view
-      v-else-if="orderCon.productInfo"
       class="goodsStyle acea-row row-between"
     >
       <view class="pictrue">
@@ -93,7 +78,6 @@
 </template>
 <script>
 import { postOrderComment, postOrderProduct } from '@/api/store'
-import { fetchSojoumOrderDetail, sojoumOrderComment } from '@/api/sojoumOrder'
 import { trim } from '@/utils'
 import { required } from '@/utils/validate'
 import { validatorDefaultCatch } from '@/utils/dialog'
@@ -120,8 +104,6 @@ export default {
           productInfo: {}
         }
       },
-      isTravelGroup: false,
-      travelOrderInfo: null,
       scoreList: [
         {
           name: '商品质量',
@@ -143,19 +125,9 @@ export default {
   },
   mounted() {
     this.unique = this.$yroute.query.id
-    this.isTravelGroup = this.$yroute.query.isTravelGroup === '1'
+    this.getOrderProduct()
-    if (this.isTravelGroup) {
-      this.getTravelOrderDetail()
-    } else {
-      this.getOrderProduct()
-    }
   },
   methods: {
-    getTravelOrderDetail() {
-      fetchSojoumOrderDetail({ key: this.unique }).then(res => {
-        this.travelOrderInfo = res.data
-      })
-    },
     getOrderProduct() {
       postOrderProduct(this.unique).then(res => {
         this.orderCon = res.data
@@ -193,26 +165,14 @@ export default {
       } catch (e) {
         return validatorDefaultCatch(e)
       }
-      const pics = this.picArr
+      postOrderComment({
-      const video = this.videoArr[0] || ''
+        productScore: product_score,
-      const request = this.isTravelGroup
+        serviceScore: service_score,
-        ? sojoumOrderComment({
+        unique: this.unique,
-            orderId: this.unique,
+        pics: this.picArr.join(','),
-            comment: expect,
+        comment: expect,
-            pics,
+        video: this.videoArr.join(',')
-            video,
+      }).then(() => {
-            productScore: product_score,
-            serviceScore: service_score
-          })
-        : postOrderComment({
-            productScore: product_score,
-            serviceScore: service_score,
-            unique: this.unique,
-            pics: this.picArr.join(','),
-            comment: expect,
-            video: this.videoArr.join(',')
-          })
-      request.then(() => {
         uni.showToast({
           title: '评价成功',
           icon: 'success',

pages/shop/GoodsList/index.vue

@@ -119,16 +119,7 @@
                   {{ item.name }}
                 </view>
                 <view class="type">
-                  <view
+                  <view v-if="item.typeName" class="type-tag">
-                    v-if="item.isTravel === 1"
-                    class="type-tag-travel"
-                  >
-                    旅居店铺
-                  </view>
-                  <view
-                    v-else-if="item.typeName"
-                    class="type-tag"
-                  >
                     {{ item.typeName }}
                   </view>
                   <view v-else>&nbsp;</view>
@@ -149,17 +140,9 @@
                 @click="goGoodsCon(good.productId)"
               >
                 <image :src="good.productImage" class="img" />
-                <view class="price" style="width: fit-content;">
+                <view class="price">
-                  <text v-if="good.isNegotiable !== 1" class="txt">￥</text>
+                  <text class="txt">￥</text>
-                  <text v-if="good.isNegotiable !== 1" class="">
+                  {{ force2Decimal(good.productPrice) }}
-                    {{ force2Decimal(good.productPrice) }}
-                  </text>
-                  <text 
-                    v-if="good.isNegotiable === 1"
-                    class="v12-primary-text v12-font-28 v12-font-weight" 
-                  >
-                    价格面议
-                  </text>
                 </view>
               </view>
             </view>
@@ -192,7 +175,7 @@
       :cartNum="cart_num"
       :showOk="true"
       @changeFun="changeFun"
-      @ok="handleOk(() => this.getCartCount())"
+      @ok="handleOk"
     />
   </view>
 </template>
@@ -205,6 +188,9 @@ import NP from 'number-precision'
 import NoGoodData from '@/components/good/NoData'
 import Recommend from '@/components/Recommend'
 import goCartMixin from '@/mixins/goCartMixins'
+import {
+  getCartCount,
+} from '@/api/store'
 export default {
   name: 'GoodsList',
   components: {
@@ -215,6 +201,7 @@ export default {
   mixins: [goCartMixin],
   data () {
     return {
+      CartCount:  0,
       webUrl: this.$VUE_APP_RESOURCES_URL,
       list: [],
       query: {
@@ -245,7 +232,17 @@ export default {
     !this.loading && this.getList()
   },
   methods: {
-    
+    // 获取购物车数量
+    getCartCount () {
+      const isLogin = this.isLogin
+      if (isLogin) {
+        getCartCount({
+          numType: 0
+        }).then(res => {
+          this.CartCount = res.data.count
+        })
+      }
+    },
     goShoppingCart() {
       this.$yrouter.switchTab('/pages/cart')
     },
@@ -270,18 +267,12 @@ export default {
       })
     },
     hotelItemClick(item) {
-      if (item.isTravel === 1) {
+      this.$yrouter.push({
-        uni.navigateTo({
+        path: '/pagesInn/inn/innHome',
-          url: '/pkg_product/views/sojoumStore?id=' + item.id
+        query: {
-        })
+          id: item.id
-      } else {
+        }
-        this.$yrouter.push({
+      })
-          path: '/pagesInn/inn/innHome',
-          query: {
-            id: item.id
-          }
-        })
-      }
     },
     getList() {
       if (this.loading || this.loadend) {
@@ -546,13 +537,6 @@ export default {
         color: #946300;
         background: linear-gradient(to bottom, #FDF8B9, #E3A72C);
       }
-      .type-tag-travel {
-        padding: 2px 6px;
-        border-radius: 3px;
-        font-size: 12px;
-        color: #fff;
-        background: linear-gradient(to bottom, #77E49F, #4FA379);
-      }
     }
     .desc {
       display: flex;

pages/town/components/information.vue

@@ -54,7 +54,7 @@
                   :src="webUrl + '/20230803152147141807.png'"
                   class="icon"
                 />
-                <text class="seeNum-txt v12-font-28">{{ $formatCount(item.pv) }}</text>
+                <text class="seeNum-txt v12-font-28">{{ item.pv }}</text>
               </view>
             </view>
           </view>

pages/town/index.vue

@@ -211,9 +211,7 @@ export default {
     },
     getActive() {
       const params = {
-        ancientTownId: this.id,
+        ancientTownId: this.id
-        page: 1,
-        pageSize: 9999
       }
       getAncientTownActive(params).then(res => {
         this.activeties = res.data.records || []

pages/user/History/index.vue

@@ -27,21 +27,11 @@
               class="v12-white v12-radius-20 history-card"
               @click="goodsDetail(historyItem)"
             >
-              <view class="delete-icon" @click.stop="deleteHistoryItem(historyItem)">
-                <u-icon
-                  name="close"
-                  color="#fff"
-                  size="16"
-                />
-              </view>
               <image
                 class="goods-img"
                 :src="historyItem.image"
                 mode="scaleToFill"
               />
-              <view v-if="isInvalidItem(historyItem)" class="invalid-mask">
-                <text class="invalid-mask-text">商品已下架</text>
-              </view>
               <view class="good-info">
                 <view
                   v-if="historyItem.couponName"
@@ -93,7 +83,7 @@
 </template>
 
 <script>
-import { getHistory, deleteHistory as deleteHistoryApi } from '@/api/user'
+import { getHistory } from '@/api/user'
 export default {
   data() {
     return {
@@ -182,13 +172,6 @@ export default {
       return str.replace(regx, '')
     },
     goodsDetail (item) {
-      if (this.isInvalidItem(item)) {
-        uni.showToast({
-          title: '商品已下架',
-          icon: 'none'
-        })
-        return
-      }
       this.$yrouter.push({
         path: '/pages/shop/GoodsCon/index',
         query: {
@@ -196,26 +179,6 @@ export default {
         }
       })
     },
-    isInvalidItem(item) {
-      if (!item) return false
-      if (item.isInvalid === true || item.isInvalid === 'true') return true
-      return Number(item.isInvalid) === 1
-    },
-    deleteHistoryItem(historyItem) {
-      const id = historyItem.id
-      if (!id) return
-      uni.showModal({
-        title: '提示',
-        content: '确认删除该浏览足迹吗？',
-        success: (res) => {
-          if (res.confirm) {
-            deleteHistoryApi(id).then(() => {
-              this.queryHistory()
-            })
-          }
-        }
-      })
-    },
     queryHistory() {
       this.items = []
       this.isLoad = false
@@ -282,7 +245,6 @@ export default {
   margin-right: 16rpx;
   border-radius: 20rpx;
   overflow: hidden;
-  position: relative;
   &:nth-child(3n) {
     margin-right: 0;
   }
@@ -291,26 +253,6 @@ export default {
     width: 226rpx;
     height: 226rpx;
   }
-  .invalid-mask{
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, 0.45);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 1;
-    .invalid-mask-text{
-      color: #fff;
-      font-size: 24rpx;
-      padding: 8rpx 16rpx;
-      border: 1px solid rgba(255, 255, 255, 0.7);
-      border-radius: 24rpx;
-      background: rgba(0, 0, 0, 0.2);
-    }
-  }
   .good-info {
     padding: 12rpx 12rpx 20rpx 12rpx;
     .price {
@@ -329,19 +271,6 @@ export default {
     }
   }
 }
-.delete-icon{
-  position: absolute;
-  top: 8rpx;
-  right: 8rpx;
-  z-index: 2;
-  width: 32rpx;
-  height: 32rpx;
-  border-radius: 16rpx;
-  // background-color: rgba(0, 0, 0, 0.35);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
 .active{
   background: #C52733;
   color: #fff !important;
@@ -354,4 +283,4 @@ export default {
   border-radius: 50%;
 }
 
-</style>
+</style>

pages/user/Message/Message.vue

@@ -97,7 +97,13 @@ export default {
 	methods: {
 		dataFormat,
 		toDetail(mid){
-			this.$yrouter.push('/pagesUser/user/MessageDetail/MessageDetail?id='+mid);
+			this.$yrouter.push('/pages/user/MessageDetail/MessageDetail?id='+mid);
+			// this.$yrouter.push({
+			//   path: "/pages/user/MessageDetail/MessageDetail",
+			//   query: {
+			//     id:mid
+			//   }
+			// });
 		}
 	},
 	onLoad:function(e){

pages/user/Points/index.vue

@@ -198,7 +198,7 @@ export default {
     },
     goOrderDetails(order) {
       this.$yrouter.push({
-        path: '/pagesOrder/order/OrderDetails/index',
+        path: '/pages/order/OrderDetails/index',
         query: {
           id: order.orderId
         }

pages/user/UpgradeElectronicProtocol/UpgradeElectronicProtocol.vue

@@ -129,7 +129,7 @@ export default {
     //显示协议内容
     toggleProtocolPage() {
       //this.$refs.popup.open();
-      this.$yrouter.push('/pagesUser/user/UpgradeProtocolDetail/UpgradeProtocolDetail')
+      this.$yrouter.push('/pages/user/UpgradeProtocolDetail/UpgradeProtocolDetail')
 
     },
     chooseIdCardFrontImage() {

pages/user/User/index.vue

@@ -86,7 +86,7 @@
           </view>
         </view>
         <view class="my-hdeader-bottom">
-          <view class="item" @click="linkTo('/pagesUser/user/UserBill/index')">
+          <view class="item" @click="linkTo('/pages/user/UserBill/index')">
             <view v-if="!isNoLogin" class="number">
               {{ userInfo.nowMoney ? force2Decimal(userInfo.nowMoney) : 0.00 }}
             </view>
@@ -98,7 +98,7 @@
               余额
             </view>
           </view>
-          <view class="item" @click="linkTo('/pagesUser/user/Points/index')">
+          <view class="item" @click="linkTo('/pages/user/Points/index')">
             <view v-if="!isNoLogin" class="number">
               {{ userInfo.integral || 0 }}
             </view>
@@ -215,16 +215,6 @@
             </view>
           </view>
         </view>
-        <view
-          v-if="(store.getters.token || userInfo.uid) &&
-            drawConfig.myTicketImageEnable === 1 &&
-            drawConfig.myTicketImage
-          "
-          class="my-ticket-entry"
-          @click="goMyTicketList"
-        >
-          <image :src="drawConfig.myTicketImage" mode="widthFix" class="img" />
-        </view>
         <!-- 我的服务开始 -->
         <view class="myService" style="margin-top: 30rpx !important;">
           <view class="title acea-row row-middle">
@@ -311,7 +301,6 @@ import {
   noticeList,
   getUserCenterBanner
 } from "@/api/user"
-import { getDrawConfig } from '@/api/lottery'
 import {isWeixin} from "@/utils"
 import cookie from "@/utils/store/cookie"
 import { pageListenMixins } from '@/mixins/pageListenMixins'
@@ -375,7 +364,7 @@ export default {
         },
         {
           text: '账户明细',
-          url: '/pagesUser/user/UserBill/index',
+          url: '/pages/user/UserBill/index',
           icon: '/icon/icon-coin.png',
           allowEnter: true
         },
@@ -387,23 +376,19 @@ export default {
         },
         {
           text: '团队管理',
-          url: '/pagesUser/user/promotion/UserPromotion/index',
+          url: '/pages/user/promotion/UserPromotion/index',
           icon: '/icon/icon-users.png',
           allowEnter: true
         },
         {
           text: '商品足迹',
-          url: '/pagesUser/user/History/index',
+          url: '/pages/user/History/index',
           icon: '/icon/icon-help.png',
           allowEnter: true
         }
       ],
       bannerBgUrl: '',
       userCenterBannerUrl: '',
-      drawConfig: {
-        myTicketImage: '',
-        myTicketImageEnable: 0
-      },
       pageKeyId: Object.freeze('userIndex'),
       nowrap: true,
       // 是否已登录
@@ -417,7 +402,6 @@ export default {
     }
   },
   onShow() {
-    uni.$emit('updateUnreadMessageCount')
     if (this.$store.getters.token) {
       this.isNoLogin = false
       uni.showLoading({
@@ -428,7 +412,6 @@ export default {
       this.getUserLevelInfoReq()
       this.isWeixin = isWeixin()
       // this.getUnreadMsgList()
-      this.getDrawConfigReq()
     } else {
       this.isNoLogin = true
       /*
@@ -445,19 +428,6 @@ export default {
   },
   methods: {
     ...mapMutations(['updateAuthorizationPage']),
-    getDrawConfigReq() {
-      getDrawConfig().then(res => {
-        if (res && res.data) {
-          this.drawConfig = {
-            myTicketImage: res.data.myTicketImage || '',
-            myTicketImageEnable: Number(res.data.myTicketImageEnable) || 0
-          }
-        }
-      }).catch(() => {})
-    },
-    goMyTicketList() {
-      this.linkTo('/pkg-video/views/county-my-tickets')
-    },
     // 新增方法：计算文本像素长度
     getTextWidth() {
       this.$nextTick(() => {
@@ -515,7 +485,7 @@ export default {
       }
     },
     goReturnList() {
-      this.$yrouter.push('/pagesOrder/order/ReturnList/index')
+      this.$yrouter.push('/pages/order/ReturnList/index')
     },
     goMyOrder(type) {
       if (this.isNoLogin) {
@@ -538,7 +508,7 @@ export default {
     },
     goUserAccount() {
       this.$yrouter.push({
-        path: '/pagesUser/user/UserAccount/index'
+        path: '/pages/user/UserAccount/index'
       })
     },
     goPersonalData() {
@@ -710,14 +680,6 @@ export default {
 }
 .my-wrapper {
   padding: 30upx;
-  .my-ticket-entry {
-    margin-top: 30rpx;
-    .img {
-      width: 100%;
-      border-radius: 24rpx;
-      display: block;
-    }
-  }
   &.wrapper {
     padding: 0 0 30rpx 0 !important;
   }