Merge branch 'release/1.1.2发布'

zhaojs

2023-06-10 69ea24e8fdfb41fc48c3fdb8c444645c13b1bbc4

Merge branch 'release/1.1.2发布'

 uniapp/App.vue

@@ -82,7 +82,8 @@
            }); */
            APPUpdate();
            // #endif
            this.getAppInfo()
            this.getAppInfo();
            //this.that.bcInit();
            let userInfo = uni.getStorageSync('userInfo')
            if (userInfo.id) {
                this.login(userInfo)
@@ -191,6 +192,7 @@
                    const plug = uni.requireNativePlugin('xiguazhu-baichuan');
                    console.log(plug)
                    plug.init({}, result => {
                        //console.log('1111111111111111111');
                        console.log(result);    // code等于0就是初始化成功
                        if(result.code==0)
                        {

 uniapp/components/indexPage.vue

@@ -49,7 +49,7 @@
                        </view>
                        
                        <!--单列图片-->
                        <view class="centerSwiper-container colCenCen borderBox" v-if="singleLineList.length>0">
                    <!--     <view class="centerSwiper-container colCenCen borderBox" v-if="singleLineList.length>0">
                            <swiper class="swiper-box" :autoplay="true" :interval="5000" :duration="300" circular>
                                <swiper-item v-for="(items,index) in singleLineList" :key='index'>
                                    <view class="swiper-item defIcon" @click="goUrl(items)">
@@ -57,6 +57,32 @@
                                    </view>
                                </swiper-item>
                            </swiper>
                        </view> -->
                        <!--快捷入口图标-->
                        <view class="c-loading-img rowCenCen">
                            <view class="imgbox defIcon" v-for="(eitem,index) in fastenter" :key="index" @click="goUrl(eitem)">
                                <image :src="eitem.image"></image>
                            </view>
                        </view>
                        <!--左轮播，右两行-->
                        <view class="centerflex f_contant">
                            <view class="f_centerSwiper-container swiper-box swiper-item f_left">
                                <swiper class="swiper-box" :autoplay="true" :interval="3000" :duration="300" :indicator-active-color="'#fff'" :indicator-dots="true" circular>
                                    <swiper-item v-for="(items,index) in popBannerSList" :key='index'>
                                        <view class="swiper-item defIcon" @click="goUrl(items)">
                                            <image :src="items.image" mode="aspectFit"></image>
                                        </view>
                                    </swiper-item>
                                </swiper>
                            </view>
                            <view class="f_right">
                                <view class="f_imgcon" v-if='enterTop.length>0' >
                                    <image :src="enterTop[0].image"  @click="goUrl(enterTop[0])"></image>
                                </view>
                                <view class="f_imgcon" v-if='enterDown.length>0'>
                                    <image :src="enterDown[0].image"  @click="goUrl(enterDown[0])"></image>
                                </view>
                            </view>
                        </view>
                        
                        <!--双列图片-->
@@ -83,7 +109,7 @@
                        </swiper>
                    </view>
                    <!--全网热销-->
                    <view class="van-row">
                    <!-- <view class="van-row">
                        <view class="van-col van-col--12" style="padding-right: 10rpx;">
                            <view class="home-row" @click="gorxb()">
                                <view class="title"><text class="name">全网热销榜</text>
@@ -131,7 +157,7 @@
                                </view>
                            </view>
                        </view>
                    </view>
                    </view> -->
                    <!-- å¤§å®¶éƒ½åœ¨ä¹° -->
                    <!-- <view class="everysBuying-container colCen" v-if="zdmList.length>0">
                        <view class="box-bar-content rowCen">
@@ -420,16 +446,12 @@
                navbarShowList: [],
                navbarList: [],
                sliderH: '',

                scrollTop: 0,
                scrollindex: 0,


                zdmList: [],
                phbList: [],
                dyList: [],
                rqList: [],

                typedataList: [
                    {
                        mainTitle: '京东',
@@ -468,9 +490,14 @@
                triggeredstate: true,
                swpidx: 0,
                canrefresh: true,
                fastenter:[],
                popBannerSList:[],
                enterTop:[],
                enterDown:[]
            }
        },
        watch: {
			
            recomendType(nval, oval){
                if(nval != oval)this.changeRecommend()
            },
@@ -592,13 +619,14 @@
            onAbort() {
                console.log('refushstop');
            },

			
            getBannerInfo() {
                // banner数据
                var that = this;
                this.$u.api.getBanner({
                    type: '1,3,4,5'
                    type: '1,3,4,5,11,12,13,14'
                }).then(e => {
                    console.log(e)
                    if (e.code == 1) return that.$alert(e.msg);
                    var res = e.data.info;
                    this.topBannerList = res.topBannerList;
@@ -606,12 +634,16 @@
                    this.singleLineList = res.singleLineList;
                    this.doubleLineList = res.doubleLineList;
                    this.bottomBannerList = res.bottomBannerList;
                    this.fastenter=res.indexbanner;
                    this.popBannerSList=res.popBannerSList;
                    this.enterTop=res.enterTop;
                    this.enterDown=res.enterDown;
                    setTimeout(() => {
                        this.triggeredstate = false;
                        this._freshing = false;
                    }, 300)
                }).catch(function(err) {

                    console.log(err)
                })
            },

@@ -621,7 +653,6 @@
                })
            },
            

            godydetails(itm) {
                const info = {}
                info.nowInfo = itm
@@ -735,10 +766,14 @@
            },

            goUrl(info) {
                console.log(info)
                utils.goUrl(info, this)
            },

            goFUrl(info)
            {
                uni.navigateTo({
                    url: info.url
                });
            },
            gojgqUrl(info) {
                if (info.urlType == '0') {
                    uni.navigateTo({
@@ -806,6 +841,68 @@
</script>

<style lang="scss">
    .f_contant
    {
            display: flex;
            justify-content: space-between;
            width: 96%;
            height: 500rpx;
            flex-direction: row;
            padding: 20rpx 0;
            margin: auto;
            .f_left{
                width:49%;
                border-radius: 12rpx;
                background: #fff;
            }
            .f_right{
                width:49%;
                display: flex;
                flex-direction: column;
                justify-content: space-between;
            }
            .f_imgcon
            {
                height: 49%;
                border-radius: 12rpx;
                image
                {
                    width:100%;
                    border-radius: 12rpx;
                    height: 100%;
                }
            }
            .f_centerSwiper-container {
				
			
                .swiper-box {
                    width: 100%;
                    height: 100%;
			
                    .swiper-item {
                        width: 100%;
                        height: 100%;
                    }
                }
            }
    }
	
    .c-loading-img {
             width: 96%;
            height: 132rpx;
            background: #fff;
            margin: auto;
            margin-top: 20rpx;
            border-radius: 12rpx;
            justify-content:space-between;
            padding:5rpx;
			
        .imgbox {
            width: 158rpx;
            height: 105rpx;
            // max-height: 72rpx;
        }
    }
    .juan {
        height: 28rpx;
        background: linear-gradient(90deg, #ff8873 0, #ff4f4f 100%);
@@ -870,7 +967,7 @@
        .pageBody-container {
            width: 100%;
            //background-color: #FFFFFF;
            margin-bottom: 16rpx;
            //margin-bottom: 16rpx;

            .column-container {
                width: 100%;

 uniapp/manifest.json

@@ -2,8 +2,8 @@
    "name" : "大返官",
    "appid" : "__UNI__FC8858A",
    "description" : "大返官app",
    "versionName" : "1.1.1",
    "versionCode" : 111,
    "versionName" : "1.1.3",
    "versionCode" : 113,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
@@ -234,5 +234,6 @@
        },
        "router" : {}
    },
    "_spaceID" : "mp-04c7f596-fd3a-4026-80a6-595162d2b5a3"
    "_spaceID" : "mp-04c7f596-fd3a-4026-80a6-595162d2b5a3",
    "locale" : "zh-Hans"
}

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Headers

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
Versions/Current/Headers

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Resources

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
Versions/Current/Resources

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/UTDID

Binary files differ

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/A/Headers/AidProtocol.h

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
//
//  AidProtocol.h
//  UtdidSDK
//
//  Created by ALLEN on 14-12-22.
//  Copyright (c) 2014å¹´ Alvin. All rights reserved.
//

#ifndef AidProtocol_h
#define AidProtocol_h

#define EVENT_REQUEST_STARTED 1000
#define EVENT_REQUEST_SUCCESS 1001
#define EVENT_REQUEST_FAILED 1002
#define EVENT_NETWORK_ERROR 1003

@protocol AidProtocolDelegate <NSObject>
@required
- (void) onAidEventChanged:(NSInteger)eventId
                       aid:(NSString *)aid;
@end

#endif

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/A/Headers/UTDevice.h

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
//
//  UTDevice.h
//  
//
//  Created by Alvin on 4/21/13.
//
//  è®¾å¤‡ä¿¡æ¯çš„分装类：sdk合作开发需要用这个类提供的设备信息接口

//  Version:utdid4all-1.1.0

#ifndef UTDIDDevice_h
#define UTDIDDevice_h

#import "AidProtocol.h"

@interface UTDevice : NSObject

/**
 * @brief                       èŽ·å–SDK生成的设备唯一标识.
 *
 * @warning                     è°ƒç”¨è¯´æ˜Ž:这个设备唯一标识是持久的,并且格式安全,iOS6以及以下,多应用互通.
 *
 *                              è°ƒç”¨é¡ºåº:utdid任意时刻都可以调用.
 *
 * @return                      24字节的设备唯一标识.
 */
+(NSString *) utdid;

/**
 * @brief                       åŒæ­¥èŽ·å¾—AID.
 *
 * @warning                     è°ƒç”¨è¯´æ˜Ž:若本地端没有最新AID，将耗费远程通信时间并阻塞线程，建议将此调用置于非主线程，或使用{@link getAidAsync}异步获得AID。
 *
 *                              è°ƒç”¨é¡ºåº:aid任意时刻都可以调用.
 *
 * @return                      AID.
 */
+(NSString *) aid:(NSString *)appName
            token:(NSString *)token;

/**
 * @brief                       å¼‚步请求AID.
 *
 * @warning                     è°ƒç”¨è¯´æ˜Ž:若本地端没有最新AID，将建立异步请求获得AID，
 *
 *                              è°ƒç”¨é¡ºåº:aidAsync任意时刻都可以调用.
 *
 * @return                      AID.
 */
+(void) aidAsync:(NSString *)appName
                 token:(NSString *)token
           aidDelegate:(id<AidProtocolDelegate>)aidDelegate;

@end

#endif

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/A/Resources/Info.plist

Binary files differ

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/A/UTDID

Binary files differ

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/Current

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
A

 uniapp/pages.json

@@ -20,6 +20,10 @@
        {
            "path": "pages/mine/setting/modifyInfo"
        },
        // ä¿®æ”¹é‚€è¯·ç 
        {
            "path": "pages/mine/setting/modifyInviteCode"
        },
        // ä¿®æ”¹ä¿¡æ¯
        {
            "path": "pages/mine/setting/cancellation"
@@ -467,6 +471,16 @@
                }
            }
        },
        //公共嵌套页面
        {
            "path": "pages/rankinglist/common_act",
            "style": {
                "navigationStyle": "custom",
                "app-plus": {
                    "titleNView": false
                }
            }
        },
        // è¶…级分类
        /* {
            "path": "pages/classify/classify",

 uniapp/pages/goods/goodsDetail.vue

@@ -225,7 +225,10 @@
            </view>
          </view>
          <view class="rightbackbox btnbox colCenCen" @tap="getCouponUrl()">
            <view class="priceText">
              <view v-if="frompage=='freebuy'" class="priceText">
                  ï¿¥{{optionsInfo.actualPrice}}
              </view>
            <view v-else class="priceText">
              ï¿¥{{optionsInfo.fanli}}
            </view>
            <view class="texttips">
@@ -296,7 +299,8 @@
        showtar: false,
        platform: '',
        inviteCodeShow: false,
        inviterShow: false
        inviterShow: false,
        frompage:'',
      };
    },
    onPageScroll(e) {
@@ -312,6 +316,7 @@
          console.log("初始化")
          getApp().getAppInfo();
      }
      //console.log("2222222222222222-"+getApp().globalData.hasbcinit);
      if(!getApp().globalData.hasbcinit)
      {
          getApp().bcInit();
@@ -323,6 +328,10 @@
      this.showtar = getApp().globalData.ifwt == 1 ? false : true;
      this.platform = plus.os.name
      // #endif
      if(options.frompage)
      {
          this.frompage=options.frompage;
      }
      if (options.id) {
        this.optionsInfo.goodsId = options.id
        this.pageType = this.optionsInfo.sourceType ? this.optionsInfo.sourceType : 'tb';
@@ -512,6 +521,7 @@
            console.log(this.pageType)
            if (this.pageType == 'tb' || this.pageType == 'tmshop' || this.pageType == 'tm') {
              if (this.user.tb_account) {
				
                this.getTbsrc()
              } else {
                this.empowerModel = true
@@ -566,6 +576,16 @@
        }).then(e => {
            console.log(e)
          if (e.code != 0) return that.$alert(e.msg)
          if(that.frompage=='freebuy')
          {//0元购的记录商品id
          console.log(e.data.info.itemId);
              this.$u.api.updateFirstFreeBrowse({
                  goodsid:that.optionsInfo.goodsId,
                  new_goodsId:e.data.info.itemId
              }).then(e=>{
		  		
              });
          }
          var res = e.data.info;
          var tburl = res.shortUrl
          // #ifdef APP-PLUS

 uniapp/pages/goods/privilege.vue

@@ -489,9 +489,9 @@
            </view>
        </view>
        
        <u-popup v-model="inviteCodeShow" mode="center" border-radius="32" :mask-close-able='true'>
    <!--     <u-popup v-model="inviteCodeShow" mode="center" border-radius="32" :mask-close-able='true'>
            <inviteCodeModel @closeModel='closeinvite' @confirm='nextStep'></inviteCodeModel>
        </u-popup>
        </u-popup> -->
        
    </view>
</template>
@@ -527,6 +527,7 @@
            getTopDate(){
                var that = this;
                this.$u.api.getUpgradeInfo({}).then(e => {
                    console.log(e);
                    if(e.code != 0) return that.$alert(e.msg)
                    that.cardInfoOne = e.data.list[0];
                    that.cardInfoTwo = e.data.list[1];

 uniapp/pages/index/categories.vue

@@ -275,7 +275,7 @@
                                }
                            
                                .back-box {
                                    width: 100rpx;
                                    width: 120rpx;
                                    height: 30rpx;
                                    background: linear-gradient(-90deg, #7619EC, #A429F3);
                                    border-radius: 5rpx;

 uniapp/pages/index/index.vue

@@ -11,6 +11,9 @@
                        <view>输入商品名或粘贴宝贝标题搜索</view>
                    </view>
                </view>
                <view class="rightgoMsg rowCenCen iconfont searchImg" @click="goPath('turnChain')">
                    <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/zhuanlian.png"></image>
                </view>
                <view class="rightgoMsg rowCenCen iconfont" @click="goPath('officialNotice')">
                    <view>&#xe6e9;</view>
                    <u-badge v-show="isNewMessage" :is-dot="true" type="success"></u-badge>
@@ -136,6 +139,7 @@
                return;
            }
            var user= uni.getStorageSync('userInfo');
            console.log(user);
            if(!user.invitation_code)
            {
                setTimeout(function(){
@@ -265,6 +269,12 @@
                        url: './officialNotice'
                    })
                }
                else if(url=='turnChain')
                {
                    uni.navigateTo({
                        url: '../mine/tools/turnChain'
                    })
                }
            },

            gobanurl(info) {
@@ -363,7 +373,7 @@
                z-index: 100;

                .leftgoSearchbox {
                    width: 615rpx;
                    width: 575rpx;
                    height: 70rpx;
                    background-color: #FFFFFF;
                    border: 1rpx solid #EDEDED;
@@ -393,6 +403,14 @@
                    color: #FFFFFF;
                }
            }
            .searchImg{
                image{
                    width: 40rpx;
                    height: 40rpx;
                    font-size: 50rpx;
                    color: #FFFFFF;
                }
            }

            .categoryNavbar-container {
                width: 100%;

 uniapp/pages/index/officialNotice.vue

@@ -1,7 +1,7 @@
<template>
    <view class="officialNotice wrapperLayer">
        <titleBar :titleText='"官方通知"' :pageForm='"officialNotice"'></titleBar>
        <view class="pageContent-container colCen">
        <view class="pageContent-container colCen" v-if='noticeList.length>0'>
            <block v-for="(items,index) in noticeList" :key="index">
                <view class="notice-items-container rowSta">
                    <view class="leftsettingbox defIcon">
@@ -26,6 +26,9 @@
            
            <aLoadMore :status="loadstatus" mode="loading3" :showTitle='true' color="#999999" ></aLoadMore>
        </view>
        <view v-else>
            æš‚无通知
        </view>
    </view>
</template>


 uniapp/pages/login/setInviteCode.vue

@@ -4,27 +4,47 @@
            è¯·è¾“入邀请码
        </view>
        <view class="grey-input-content rowCen borderBox">
            <input class="iptclas" type="text" v-model="inviteCode" placeholder="请填写邀请码" placeholder-class="pla-input"/>
            <input class="iptclas" type="text" v-model="inviteCode" placeholder="请填写邀请码！" placeholder-class="pla-input"/>
        </view>
        <view class="model-tips" v-if="appInfo.isOpenOfficialCode==1">
         <view class="model-tips" v-if="appInfo.isOpenOfficialCode==1">
            <view>填写邀请码有助于您的购物返佣哦！</view>
        </view>
        
        <template v-if="isShowCode">
        <view class="copy-bar rowCenBet borderBox" v-if="appInfo.isOpenOfficialCode==1">
            <view class="left-code">
                {{appInfo.officialInvitationCode}}
            </view>
            <view class="copybtn rowCenCen" @tap="useCode()">
                <view>使用邀请码</view>
            </view>
        </view>
        </template>
		
        <view @click="setCode" class="login-btn rowCenCen" :class="inviteCode?'colorfulbtn':''" >
            <view class="btn-font"  >
                ç¡®å®š
            </view>
        </view>
		
        <template v-if="isShowCode">
            <template v-if='commonInvite!=null&&commonInvite.length>0'>
            <view class="s_inviter" @click="userInviter()">
                <view class="s_img">
                    <image :src="commonInvite[inviteIndex].avatar"></image>
                    <span>{{commonInvite[inviteIndex].nickname}}</span>
                </view>
                <view>
                    <view>使用Ta的邀请码</view>
                </view>
            </view>
            <view @click="changeInviter()" style="color: #999999; margin-top: 20rpx;">
                æ¢ä¸€ä¸ª
            </view>
            </template>
            <template v-else>
            <view class="copy-bar rowCenBet borderBox" style="margin-top: 70rpx;" v-if="appInfo.isOpenOfficialCode==1">
                                <view class="left-code">
                                    {{appInfo.officialInvitationCode}}
                                </view>
                                <view class="copybtn rowCenCen" @tap="useCode()">
                                    <view>使用邀请码</view>
                                </view>
                            </view>
            </template>
			
			
        </template>
        
        <view class="yqmtip rowCenCen">
            <span @click="showinvite">没有邀请码？</span>
@@ -49,14 +69,47 @@
                inviteCode:'',
                appInfo:'',
                inviterShow:false,
                platform:''
                platform:'',
                commonInvite:[],
                inviteIndex:0
            }
        },
        onLoad()
        {
            this.getInviter();
        },
        mounted() {
            this.appInfo = uni.getStorageSync('appInfo');
            this.platform = uni.getSystemInfoSync().platform
        },
        methods: {
            //获取系统推荐人
            getInviter()
            {
                var that=this;
                this.$u.api.getRecomInviter({}).then(e => {
                    console.log(e)
                    that.commonInvite=e.data;
                }).catch(function (err) {
                    console.log(err)
                })
            },
            changeInviter()
            {
                console.log(this.commonInvite.length)
                if(this.inviteIndex==this.commonInvite.length-1)
                {
                    this.inviteIndex=0;
                }
                else{
                    this.inviteIndex=this.inviteIndex+1;
                }
            },
            userInviter()
            {
                this.inviteCode=this.commonInvite[this.inviteIndex].invitation_code;
            },
			
            useCode()
            {
                this.inviteCode=this.appInfo.officialInvitationCode;
@@ -126,7 +179,6 @@
                    })
                }
            }

        }
    }
</script>
@@ -136,6 +188,26 @@
    {
        background: #fff;
    }
    .s_inviter
    {
        display: flex;
        justify-content: space-between;
        align-items: center;
        margin-top: 70rpx;
        width:100%;
        .s_img
        {
            display: flex;
            align-items: center;
            span{
                margin-left: 13rpx;
            };
        }
        image{
            width:100rpx;
            height: 100rpx;
        }
    }
    
    .yqmtip
    {

 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>
@@ -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() {

 uniapp/pages/mine/inviteFriends.vue

@@ -35,7 +35,12 @@
                    æœªæ¥ä»–/她有购物订单,您可获得佣金奖励,并自动计入您的帐户
                </view>
            </view>

			
            <view class="invit_cont">
                <view class="invit_v" @click="checkVideo(0)"><image src='https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/vi_jiaocheng.png'></image></view>
                <view class="invit_v" @click="checkVideo(1)"><image src='https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/vi_yaoqing.png'></image></view>
            </view>
			
            <view class="bottom-options-container rowCenAro">
                <view class="option-items-container colCen" @tap='copyLink()'>
                    <image class="icon-box" src="../../static/images/mine/link.png" mode="aspectFill"></image>
@@ -156,6 +161,22 @@
            this.makeCode()
        },
        methods: {
            checkVideo(type)
            {
                console.log(type)
                if(type==1)
                {
                    uni.navigateTo({
                        url: '/pages/webView/webView?url=http://dfgapp.ushopvip.com/html/fxguid.html'
                    })
                }
                else{
                    uni.navigateTo({
                        url: '/pages/webView/webView?url=http://dfgapp.ushopvip.com/html/newuse.html'
                    })
                }
				
            },
            showModel() {
                this.$nextTick(()=>{
                    this.getbanner()
@@ -414,6 +435,21 @@
</script>

<style lang="scss">
    .invit_cont
    {
            display: flex;
            justify-content: space-between;
            width: 100%;
            margin-top: 25rpx;
            .invit_v
            {
                width: 49%;
            }
            image
            {
                height: 145rpx;
            }
    }
    .inviteFriends-wrapper {
        width: 100%;


 uniapp/pages/mine/mine.vue

@@ -81,8 +81,8 @@
                    </view>
                </view>
            </view>

            <view class="account-assets-container rowCenCen borderBox" v-if="!showtar || platform!='iOS'">
			
                <view class="cardBac-container rowStaBet borderBox">
                    <view class="left-content">
                        <view class="balance">
@@ -124,7 +124,27 @@
                    </view>
                </view>
            </view>

			
            <view class="vip-info-container rowCenBet" v-if="!showtar || platform!='iOS'">
            <view class="left-info" v-if="user.level != 3">
              å‡çº§ç­‰çº§å¯æ‹¿æ›´é«˜æ”¶ç›Š
            </view>
            <view class="left-info" v-else>
              æ‚¨å·²ç»æ˜¯æœ€é«˜ç­‰çº§,快去邀请好友赚佣金吧!
            </view>
            <view class="rt-btn rowCenCen" @tap="golevelRules()" v-if="user.level != 3">
              <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
              <view class="level-txt">
                ç«‹å³å‡çº§
              </view>
            </view>
            <view class="rt-btn rowCenCen" @tap="golevelRules()" v-else>
              <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
              <view class="level-txt">
                ç«‹å³æŸ¥çœ‹
              </view>
            </view>
            </view>
            <view class="swiper-container borderBox" v-if="bannerList.length>0">
                <swiper class="banerContent" :autoplay="true" :interval="3000" :duration="1000" circular>
                    <swiper-item v-for="(items,index) in bannerList" :key="index" @tap="goUrl(items)">
@@ -324,7 +344,11 @@
                }).catch(function (err) {
                })
            },
			
            golevelRules() {
             uni.navigateTo({
               url: '../goods/privilege'
             })
            },
            getuserInfo() {
                var that = this;
                this.$u.api.getUserInfo({}).then(e => {
@@ -346,6 +370,7 @@
            },

            centerInfo() {
                  this.user = uni.getStorageSync('userInfo');
                var that = this;
                this.$u.api.userHomemenu({}).then(e => {
                    var res = e.data.list;
@@ -711,10 +736,42 @@
                }
            }
        }

        .vip-info-container {
          width: 100%;
          height: 60rpx;
          background: #FFF2CF;
         border-radius: 16rpx;
          padding: 0 20rpx;
          margin-bottom: 20rpx;
		
          .left-info {
            font-size: 24rpx;
            font-weight: 500;
            color: #593A0F;
          }
		
          .rt-btn {
            width: 152rpx;
            height: 44rpx;
            background-color: rgba(0, 0, 0, 0.6);
            border-radius: 22rpx;
		
            .vipimg {
              width: 27rpx;
              height: 24rpx;
            }
		
            .level-txt {
              font-size: 24rpx;
              font-weight: 500;
              color: #FFFFFF;
              margin-left: 10rpx;
            }
          }
        }
        .mine-under-container {
            width: 100%;
            margin-top: 85rpx;
            margin-top: 95rpx;
            padding: 0 30rpx;

            .nav-container {

 uniapp/pages/mine/mt.vue

@@ -1,9 +1,9 @@
<template>
    <view class="elm-wrapper wrapperLayer"
        :style="optionsCurrent==2?'background-color:#62BC00;':'background-color:#FFD100;'">
        :style="optionsCurrent==2?'background-color:#FFD100;':'background-color:#FFD100;'">

        <view class="flexbox borderBox colCen"
            :style="optionsCurrent==2?'background-color:#62BC00;':'background-color:#FFD100;'">
            :style="optionsCurrent==2?'background-color:#FFD100;':'background-color:#FFD100;'">
            <view class="topbarbox"></view>
            <view class="leftimgbox rowCenBet" @tap="back()">
                <view class="shadow rowCenCen" style="background:rgba(0,0,0,0);">
@@ -21,14 +21,14 @@
        </view>

        <view class="options-bar-content rowCenCen">
            <!-- <view class="center-container rowCenBet">
             <view class="center-container rowCenBet">
                 <block v-for="(items,index) in optionsList" :key="index">
                    <view class="items-content rowCenCen" @tap="navTap(items.type)" :class="{ 'yellow':items.type == optionsCurrent && [1,3].includes(optionsCurrent), 'green': items.type == optionsCurrent && optionsCurrent ==2 }">
                        <view>{{items.label}}</view>
                    </view>
                </block>
                <div class="items-active" :style="{'transform':'translateX('+(optionsCurrent-1) * 120 +'rpx)'}"></div>
            </view> -->
            </view>
        </view>

        <image class="pageBac" :src="pageBac" mode="aspectFill">
@@ -76,9 +76,13 @@
                optionsCurrent: 1,
                scrollTop: 0,
                optionsList: [{
                        label: "外卖",
                        label: "美团",
                        type: 1
                    }
                    },
                    {
                            label: "饿了么",
                            type: 2
                        }
                /*     ,
                    {
                        label: "商超",
@@ -138,7 +142,14 @@
            navTap(type) {
                if (this.optionsCurrent != type) {
                    this.optionsCurrent = type
                    if (this.optionsCurrent == 2) {
                    if(this.optionsCurrent==2)
                    {//跳转饿了么
                        uni.redirectTo({
                            url:'./elm'
                        })
                        return;
                    }
                    else if (this.optionsCurrent == 2) {
                        uni.setNavigationBarColor({
                            frontColor: '#ffffff',
                            backgroundColor: '#62BC00'
@@ -244,7 +255,7 @@
            margin-top: 168rpx;
            .center-container {
                position: relative;
                width: 360rpx;
                width: 240rpx;
                height: 58rpx;
                background: rgba(254, 254, 254, 0.3);
                border-radius: 29rpx;

 uniapp/pages/mine/queryHistory.vue

@@ -21,7 +21,7 @@
        </view>
        
        <view class="goods-container pd20" v-if="goodsinfo">
            <view class="card-container rowCen">
            <view class="card-container rowCen" @click="targetTb(goodsinfo.goodsId)">
                <image class="goods-pic" :src="goodsinfo.mainPic" mode="aspectFill"></image>
                <view class="goods-info colCenBet">
                    <view class="info-top-box">
@@ -36,7 +36,7 @@
                        <view class="discounts-container rowCen borderBox">
                            <view class="coupon-box rowCenCen">
                                <view>
                                    3元券
                                    {{goodsinfo.couponPrice}}元券
                                </view>
                            </view>
                            <view class="back-box rowCenCen">
@@ -121,6 +121,11 @@
            
        },
        methods:{
            targetTb(goodsid){
                 uni.navigateTo({
                                  url: '/pages/goods/goodsDetail?id=' + goodsid
                 });
            },
            showColumn(canvasId,chartData){
                var _self = this
                canvasColumn=new uCharts({

 uniapp/pages/mine/setting/modifyInviteCode.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,275 @@
<template>
    <view class="modifyPass-container wrapperLayer">
        <titleBar titleText='' :pageForm='"modifyPass"'></titleBar>
        <view class="pageInfoContent-container colCen borderBox">
            <view class="titleText">
                ä¿®æ”¹é‚€è¯·ç 
            </view>
            <view v-if="user.level >=ablelevel">
				
			
            <view class="input-container colCen">
                <view class="outSidebox rowCenBet" data-type='code'>
                    <input 
                        :disabled="!isedit"
                        maxlength="8"
                        type="text"
                        v-model="code"
                        :placeholder="c_placeholder" 
                        placeholder-class="input-placeHolder"/>
                </view>
            </view>
			
            <view class="txtTips">
                é‚€è¯·ç éœ€è®¾ç½®ä¸º4~8位的数字与字母的组合。
            </view>
            </view>
            <view v-if="user.level <ablelevel">
				
			
            <view class="vip-info-container rowCenBet" v-if="!showtar || platform!='iOS'">
            <view class="left-info" >
              å½“前等级不可修改，再邀请{{needIvite}}人升级
            </view>
            <!-- <view class="left-info" v-else>
              æ‚¨å·²ç»æ˜¯æœ€é«˜ç­‰çº§,快去邀请好友赚佣金吧!
            </view> -->
            <view class="rt-btn rowCenCen" @tap="golevelRules()" v-if="user.level <ablelevel">
              <image class="vipimg" src="../../../static/images/goods/vip.png" mode="aspectFill"></image>
              <view class="level-txt">
                ç«‹å³å‡çº§
              </view>
            </view>
            </view>
            <!-- <view class="rt-btn rowCenCen" @tap="golevelRules()" v-else>
              <image class="vipimg" src="../../../static/images/goods/vip.png" mode="aspectFill"></image>
              <view class="level-txt">
                ç«‹å³æŸ¥çœ‹
              </view>
            </view> -->
            </view>
            <view v-if="isedit" class="login-btn rowCenCen" :class="true?'colorfulbtn':''" @click="modify()">
                <view class="btn-font">
                    ç¡®è®¤ä¿®æ”¹
                </view>
            </view>
            <view v-else  class="login-btn rowCenCen" :class="true?'colorfulbtn':''" @click="back()">
                <view class="btn-font">
                    è¿”回
                </view>
            </view>
        </view>
    </view>
</template>

<script>
    import titleBar from '../../../components/backTitlebar.vue'
    import MD5 from '../../../utils/md5.js'
    import config from '../../../utils/config.js'
    import util from '../../../utils/utils.js'
    export default {
        components: {
            titleBar
        },
        data(){
            return{
                user:'',
                code:'',
                showtar:false,
                platform:'',
                isedit:false,
                needIvite:0,
                ablelevel:2,
                c_placeholder:'请输入新的邀请码'
            }
        },
        onLoad() {
            this.getUserInfo();
        },
        methods:{
            getUserInfo()
            {
                // #ifdef APP-PLUS
                this.showtar = getApp().globalData.ifwt == 1 ? false : true;
                this.platform = plus.os.name
                // #endif
				
                var that = this;
                this.$u.api.getUserInfo({}).then(e => {
                    that.user = e.data.userinfo;
                    that.isedit=that.user.level>=that.ablelevel;
                    console.log(that.isedit)
                    if(that.user.level<that.ablelevel)
                    {
                        that.c_placeholder='当前等级不可修改哦';
                        this.getTopDate();
                    }
                    util.setCache('userInfo', e.data.userinfo)
                }).catch(function (err) {
                    console.log(err)
                })
            },
            getTopDate(){
                var that = this;
                this.$u.api.getUpgradeInfo({}).then(e => {
                    console.log(e);
                    var nextSet=e.data.list[1];
                    var needcount=(nextSet.direct_primary_count+nextSet.direct_intermediate_count)-e.data.info.user_zong_num;
                    that.needIvite=needcount<0?0:needcount;
                    }).catch(function (err) {
                })
            },
            back()
            {
                uni.navigateBack({
                    delta:1
                })
            },
            golevelRules() {
             uni.navigateTo({
               url: '../../goods/privilege'
             })
            },
            modify() {
                var that = this;
                var str = /^[a-zA-Z0-9]{4,8}$/;
                if (str.test(this.code)) {
                    this.$u.api.changeCode({
                        invite_code:this.code
                    }).then(e => {
                        if(e.code == 1)return that.$alert(e.msg);
                        that.$alert('修改成功');
                        setTimeout(function(){
                            uni.navigateBack({
                                delta:1
                            })
                        },1000)
						
                    }).catch(function (err) {
                    })
                } else {
                    uni.showToast({
                        title: '邀请码不符合要求，请输入4~8位的数字与字母的组合',
                        icon: 'none',
                        position: 'bottom',
                        duration: 3000
                    });
                }
            }
        }
    }
</script>

<style lang="scss">
    .vip-info-container {
      width: 100%;
      height: 60rpx;
      background: #FFF2CF;
     border-radius: 16rpx;
      padding: 0 20rpx;
      margin-top: 40rpx;
      .left-info {
        font-size: 24rpx;
        font-weight: 500;
        color: #593A0F;
        margin-right: 15rpx;
      }
	
      .rt-btn {
        width: 152rpx;
        height: 44rpx;
        background-color: rgba(0, 0, 0, 0.6);
        border-radius: 22rpx;
	
        .vipimg {
          width: 27rpx;
          height: 24rpx;
        }
	
        .level-txt {
          font-size: 24rpx;
          font-weight: 500;
          color: #FFFFFF;
          margin-left: 10rpx;
        }
      }
    }
	
    .modifyPass-container{
        width: 100%;
        min-height: 100vh;
        background-color: #FFFFFF;
        .pageInfoContent-container{
            width: 100%;
            padding: 0 60rpx;
            .titleText{
                width: 100%;
                font-size: 42rpx;
                font-weight: bold;
                color: #333333;
                margin: 60rpx 0;
            }
			
            .input-container{
                width: 100%;
                margin-bottom: 20rpx;
                .outSidebox{
                    width: 100%;
                    height: 85rpx;
                    border-bottom: 2rpx solid #F1F1F1;
                    .input-placeHolder{
                        font-size: 34rpx;
                        font-weight: 500;
                        color: #CACACA;
                    }
                    input{
                        font-size: 34rpx;
                        font-weight: 500;
                        color: #222222;
                    }
                    .hidepass{
                        font-size: 32rpx;
                        font-weight: 800;
                        color: #CACACA;
                    }
                    .getcodebox{
                        font-size: 28rpx;
                        white-space: nowrap;
                        font-weight: 400;
                        color: #FF2851;
                        pointer-events: none;
                    }
                    .colorTxt{
                        pointer-events: auto;
                    }
                }
                .outSidebox-active{
                    border-bottom: 2rpx solid #FF2851;
                }
            }
            .login-btn{
                width: 100%;
                height: 86rpx;
                background: #E2E2E2;
                border-radius: 43rpx;
                margin-top: 80rpx;
                pointer-events: none;
                .btn-font{
                    font-size: 30rpx;
                    font-weight: 500;
                    color: #FFFFFF;
                }
            }
            .txtTips {
                font-size: 26rpx;
                font-weight: 400;
                color: #999999;
                line-height: 38rpx;
            }
            .colorfulbtn{
                background: #FD002F;
                pointer-events: auto;
            }
        }
    }
</style>

 uniapp/pages/mine/setting/setting.vue

@@ -355,7 +355,7 @@
            openModel(type) {
                this.modelType = type;
                if (this.modelType == 'clean') {
                    this.content = '确定要清楚缓存吗？';
                    this.content = '确定要清除缓存吗？';
                    this.showModel = true;
                } else if (this.modelType == 'logout') {
                    this.content = '确定要退出当前账号吗？';

 uniapp/pages/rankinglist/common_act.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,85 @@
<template>
    <view>
        <web-view :webview-styles="webviewStyles" :src="webviewUrl" @message='received'></web-view>
		
    </view>
	
</template>

<script>
    var wv;
    export default {
        data() {
            return {
                empowerModel: false,
                webviewUrl: '',
                user:'',
                webviewStyles: {
                    progress: {
                        color: '#EE1B14'
                    }
                },
            }
        },
        onLoad(options) {
            if(!this.hasLogin){
                uni.reLaunch({
                    url:"/pages/login/wxlogin"
                })
            }
            else{
                const value = uni.getStorageSync('userInfo');
                 this.user = value;
                if(options.t_url)
                {
                    console.log(encodeURI(decodeURIComponent(options.t_url)+"?token="+value.token+"&userid="+value.id));
                    this.webviewUrl = encodeURI(decodeURIComponent(options.t_url)+"?token="+value.token+"&userid="+value.id);
                }
            }
			
        },
        onReady() {
          this.clearMuiBack();
        },
		
        methods: {
			
            received(e) {
                var res=e.detail.data[0];
                 if(res.action=='back')
                {
                    this.backLast();
                }
            },
            backLast()
            {
                uni.navigateBack({
                    delta: 1
                });
            },
            // å…³é—­mui返回
              clearMuiBack() {
                // #ifdef APP-PLUS
                var currentWebview = this.$scope.$getAppWebview().children()[0];
                //监听注入的js
                currentWebview.addEventListener("loaded", function() {
                  currentWebview.evalJS("mui.init({keyEventBind: {backbutton: false }});");
                });
                // #endif
              },
			  
        },
        onNavigationBarButtonTap(e) {
            // #ifdef APP-PLUS
            const currentWebview = this.$scope.$getAppWebview(); //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效，非v3编译模式使用this.$mp.page.$getAppWebview()
            var wv = currentWebview.children()[0]
            wv.reload();
            // #endif
            console.log(JSON.stringify(e))
        },
    }
</script>

<style>

</style>

 uniapp/pages/rankinglist/fengqiang.vue

@@ -25,6 +25,7 @@
            }
            else{
                const value = uni.getStorageSync('userInfo');
                console.log(value);
                this.webviewUrl = encodeURI('http://dfgapp.ushopvip.com/html/fengqiangbang.html?token='+value.token);
            }
            

 uniapp/utils/config.js

@@ -1,5 +1,6 @@
//const httpUrl = ""; // æŽ¥å£åŸŸå
const httpUrl = "http://dfgapp.ushopvip.com"; // æŽ¥å£åŸŸå
//const httpUrl = "http://appapitest.ushopvip.com"; // æµ‹è¯•çŽ¯å¢ƒæŽ¥å£åŸŸå
const httpUrl = "http://dfgapp.ushopvip.com"; // ç”Ÿäº§çŽ¯å¢ƒæŽ¥å£åŸŸå
const salt = ""; 
export default {
    httpUrl:httpUrl,

 uniapp/utils/http.api.js

@@ -97,6 +97,9 @@
let getPrivilegeShareLinkUrl = "api/taoke/get_privilege_share_link";
let eleStoreListUrl = "api/taoke/ele_store_list";
let getHdkCategoryListUrl="/api/taoke/get_hdk_category_list";
let changeCodeUrl="/api/user/changecode";
let getRecomInviterUrl="/api/user/getRecomInviter";
let updateFirstFreeBrowseUrl="/api/user/update_first_free_browse";

// æ­¤å¤„第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作，更多内容详见uView对拦截器的介绍部分：
// https://uviewui.com/js/http.html#%E4%BD%95%E8%B0%93%E8%AF%B7%E6%B1%82%E6%8B%A6%E6%88%AA%EF%BC%9F
@@ -200,8 +203,13 @@
    let getPrivilegeShareLink = (params = {}) => vm.$u.post(getPrivilegeShareLinkUrl, params); 
    let eleStoreList = (params = {}) => vm.$u.post(eleStoreListUrl, params); 
    let getHdkCategoryList= (params = {}) => vm.$u.post(getHdkCategoryListUrl, params); 
    let changeCode=(params = {}) => vm.$u.post(changeCodeUrl, params); //修改邀请码
    let getRecomInviter=(params = {}) => vm.$u.post(getRecomInviterUrl, params); //获取推荐邀请人
    let updateFirstFreeBrowse=(params = {}) => vm.$u.post(updateFirstFreeBrowseUrl, params); //记录0元购
	
	
    // å°†å„个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
    vm.$u.api = {getHdkCategoryList,eleStoreList,getPrivilegeShareLink,getDyGoodsDetail,bindMobileLogin,getTopMessId,changePwd,comminInt,wxapplogin,getTopCalss,getBanner,getHomeMenu,getSuperClass,getMQD,getGoodThing,login,sendSms,mobileLogin,setPwd,getUserInfo,getTalentInfo,getMessageList,getGoodsDetail,getPrivilegeLink,getSimilerGoods,getJdsDetail,getPddDetail,getM,getWphGoodsDetail,addCollect,delCollect,hotKey,suggestion,goodsSearch,activityLink,unionAct,singlePageLink,checkPddAuth,getPddAuth,getPineGoods,jdGoodsList,optimusMaterial,pddGoodsList,brandList,brandInfo,wphGoodsList,meituanAct,eleAct,eleShangjin,userHomemenu,getAppVersion,userBrowse,delBrowse,activitySingle,userCollect,bdHomemenu,getCity,coordinate,cityCate,searchDeals,getCityId,seckillShowinfo,seckillList,identifyGoods,changeMobile,bindInvitation,getInviteInfo,getEstimateAmount,fansList,getFansCount,getHelpType,getHelpList,getHelpDetail,getWpanurl,getChainTurning,superDiscountGoods,getHistory,getTbGoodsList,cateRankList,getUpgradeInfo,getEquityCard,levelApply,orderList,userProfit,bindZfb,withdraw,getBalanceLog,getPublisher,getAlbum,likeAlbum,albumDetail,anchorFollow,myFollowAlbum,feedback,userCancel,profile,bindWechat,unboundWechat};
    vm.$u.api = {updateFirstFreeBrowse,getRecomInviter,changeCode,getHdkCategoryList,eleStoreList,getPrivilegeShareLink,getDyGoodsDetail,bindMobileLogin,getTopMessId,changePwd,comminInt,wxapplogin,getTopCalss,getBanner,getHomeMenu,getSuperClass,getMQD,getGoodThing,login,sendSms,mobileLogin,setPwd,getUserInfo,getTalentInfo,getMessageList,getGoodsDetail,getPrivilegeLink,getSimilerGoods,getJdsDetail,getPddDetail,getM,getWphGoodsDetail,addCollect,delCollect,hotKey,suggestion,goodsSearch,activityLink,unionAct,singlePageLink,checkPddAuth,getPddAuth,getPineGoods,jdGoodsList,optimusMaterial,pddGoodsList,brandList,brandInfo,wphGoodsList,meituanAct,eleAct,eleShangjin,userHomemenu,getAppVersion,userBrowse,delBrowse,activitySingle,userCollect,bdHomemenu,getCity,coordinate,cityCate,searchDeals,getCityId,seckillShowinfo,seckillList,identifyGoods,changeMobile,bindInvitation,getInviteInfo,getEstimateAmount,fansList,getFansCount,getHelpType,getHelpList,getHelpDetail,getWpanurl,getChainTurning,superDiscountGoods,getHistory,getTbGoodsList,cateRankList,getUpgradeInfo,getEquityCard,levelApply,orderList,userProfit,bindZfb,withdraw,getBalanceLog,getPublisher,getAlbum,likeAlbum,albumDetail,anchorFollow,myFollowAlbum,feedback,userCancel,profile,bindWechat,unboundWechat};
}

export default {

 uniapp/utils/utils.js

@@ -45,6 +45,7 @@


common.goUrl = function(info, _this) {
    console.log(info)
    var userinfo = common.getCacheSync('userInfo')
    var that = _this;
    if (userinfo) {