Merge branch 'feature/1.1.4开发' into develop

zhaojs

2023-07-20 fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff

 uniapp/pages/mine/elm.vue

@@ -1,8 +1,8 @@
<template>
   <view class="elm-wrapper wrapperLayer"
      :style="optionsCurrent==3?'background-color:#1088FE;':'background-color:#62BC00;'">
      :style="optionsCurrent==3?'background-color:#1088FE;':'background-color:#1088FE;'">
      <view class="flexbox borderBox colCen"
         :style="optionsCurrent==3?'background-color:#1088FE;':'background-color:#62BC00;'">
         :style="optionsCurrent==3?'background-color:#1088FE;':'background-color:#1088FE;'">
         <view class="topbarbox"></view>
         <view class="leftimgbox rowCenBet" @tap="back()">
            <view class="shadow rowCenCen" style="background:rgba(0,0,0,0);">
@@ -22,7 +22,7 @@
         <view class="center-container rowCenBet">
            <block v-for="(items,index) in optionsList" :key="index">
               <view class="items-content rowCenCen"
                  :style="optionsCurrent==items.type?items.type==3?'color:#1088FE;':'color:#62BC00;':''"
                  :style="optionsCurrent==items.type?items.type==3?'color:#1088FE;':'#1088FE;':''"
                  @tap="navTap(items.type,index)">
                  <view>{{items.label}}</view>
               </view>
@@ -49,12 +49,12 @@
            <image class="miniCodeImg" :src="wxQrcodeUrl" mode="aspectFit"></image>

            <view class="getBtn-container rowCenCen" @tap="jumpMini()">
               <view>领红包点外卖①</view>
               <view>领红包点外卖</view>
            </view>

            <view class="getBtn-container rowCenCen" @tap="jumpShangJinMini()">
         <!--    <view class="getBtn-container rowCenCen" @tap="jumpShangJinMini()">
               <view>领加餐红包②</view>
            </view>
            </view> -->
         </view>
      </view>

@@ -85,16 +85,22 @@
      data() {
         return {
            optionsCurrent: 3,
            activeIndex: 0, // 当前选中的index
            activeIndex: 1, // 当前选中的index
            scrollTop: 0,
            optionsList: [{
                  label: "外卖",
                  type: 3
            optionsList: [
               {
                  label: "美团",
                  type: 0
               },
               {
                  label: "饿了么",
                  type: 3
               },
					
               /* {
                  label: "果蔬",
                  type: 5
               }
               } */
            ],
            pageInfo: null,
            wxQrcodeUrl: '',
@@ -132,7 +138,14 @@
            if (this.optionsCurrent != type) {
               this.optionsCurrent = type
               this.activeIndex = index
               if (this.optionsCurrent == 5) {
               if(this.optionsCurrent == 0)
               {
                  uni.redirectTo({
                     url:'./mt'
                  })
                  return;
               }
               /* else if (this.optionsCurrent == 5) {
                  uni.setNavigationBarColor({
                     frontColor: '#ffffff',
                     backgroundColor: '#62BC00'
@@ -143,7 +156,7 @@
                     backgroundColor: '#1088FE'
                  })
               }
               this.IntiData()
               this.IntiData() */
            }
         },
         jumpMini() {
@@ -195,6 +208,7 @@
            var that = this;
            this.$u.api.eleShangjin({}).then(e => {
               if(e.code != 0) return that.$alert(e.msg)
               console.log(e)
               uni.hideLoading()
               uni.stopPullDownRefresh()
               var res = e.data;
@@ -258,7 +272,7 @@

      .options-bar-content {
         width: 100%;
         margin-top: 168rpx;
         margin-top: 198rpx;

         .center-container {
            position: relative;