Merge tag 'v1.1.3发布' into develop

zhaojs

2023-06-30 ea3df4a7c5e60fff7935eed4b07feebde8c4e723

Merge tag 'v1.1.3发布' into develop

 uniapp/components/rowGoods.vue

@@ -17,7 +17,7 @@
    
            <view class="cardbottom-container colCenEnd">
                <view class="discounts-container rowCen borderBox">
                    <view class="coupon-box rowCenCen" style="border: 1px solid #f50d49; color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
                    <view class="coupon-box rowCenCen" style="border: 1px solid #f50d49;width:auto;color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
                        <view>
                            {{items.sourceType=='wph'?items.discount+'折':items.couponPrice+'元券'}}
                        </view>

 uniapp/manifest.json

@@ -2,8 +2,8 @@
    "name" : "大返官",
    "appid" : "__UNI__FC8858A",
    "description" : "大返官app",
    "versionName" : "1.2.3",
    "versionCode" : 123,
    "versionName" : "1.1.3",
    "versionCode" : 113,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 uniapp/pages/active/tmsearch.vue

@@ -1,5 +1,5 @@
<template>
    <view class="pddsearch-wrapper wrapperLayer borderBox"  style="background: #fff;">
    <view class="pddsearch-wrapper wrapperLayer borderBox">
        <view class="topbarbox"></view>
        <view class="fixed-container colCen">
            <view class="topbarbox"></view>
@@ -65,7 +65,7 @@
            <view class="scrangeList-container rowCen" :class="scrollTop>fiexdtop?'tofixed':''" :style="'top:'+(scrollTop>fiexdtop?fiexdHeight:'0')+'px;'">
                <scroll-view class="scrollview-content" scroll-x scroll-with-animation="true">
                    <block v-for="(items,index) in secrendSearch" :key="index">
                        <view class="rangeItem" :class="nowsec==items.id?'rangeItem-active':''" @tap="changeSeRange(items.id)">
                        <view class="rangeItem" style="font-size: 13px;margin-right: 30rpx; color: #8b8686;" :class="nowsec==items.id?'rangeItem-active':''" @tap="changeSeRange(items.id)">
                            <view class="boxcontent colCenCen">
                                <view class="nameBox">
                                    {{items.name}}

 uniapp/pages/index/index.vue

@@ -137,32 +137,10 @@
            this.getPopBannerInfo();
        },
        onShow() {
            /* if(!this.hasLogin){
                setTimeout(function(){
					
                    uni.reLaunch({
                        url:"/pages/login/wxlogin"
                    })
                },1000);
                return;
            } */
            if(!this.hasshow)
            {
                this.shShow();
            }
			
        /*     var user= uni.getStorageSync('userInfo');
            console.log(user); */
            // if(!user.invitation_code)
            // {
            //     setTimeout(function(){
					
            //         uni.reLaunch({
            //             url:"/pages/login/wxlogin"
            //         })
            //     },1000);
            //     return;
            // }
            } 
            if(this.categoryList){
                this.getCategoryList();
            }
@@ -180,34 +158,38 @@
            shShow()
            {
                var that=this;
                var istoLogin=true;
                this.$u.api.comminInt({}).then(e => {
                    that.hasshow=true;
                    // #ifdef APP-PLUS
                    if (plus.os.name == 'iOS') {
                        if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
                            that.isshowtype=true;
                            istoLogin=false;
                        } else {
                            that.isshowtype=false;
                            console.log("跳转");
                            if(!that.hasLogin){
                        }
                    }
                    if(istoLogin)
                    {
                        if(!that.hasLogin){
                            uni.reLaunch({
                                url:"/pages/login/wxlogin"
                            })
                        }
                        /* var user= uni.getStorageSync('userInfo');
                        if(!user.invitation_code)
                        {
                            setTimeout(function(){
								
                                uni.reLaunch({
                                    url:"/pages/login/wxlogin"
                                })
                            }
                            var user= uni.getStorageSync('userInfo');
                            if(!user.invitation_code)
                            {
                                setTimeout(function(){
									
                                    uni.reLaunch({
                                        url:"/pages/login/wxlogin"
                                    })
                                },1000);
                                return;
                            }
                        }
                        console.log(that.isshowtype);
                            },1000);
                            return;
                        } */
                    }
					
                    // #endif
                }).catch(function(err) {
                    console.log(err);

 uniapp/pages/login/setInviteCode.vue

@@ -161,7 +161,7 @@
                        uni.switchTab({
                          url: '../index/index'
                        })
                     */}
                     }*/
                }).catch(function (err) {
                    console.log(err)
                })

 uniapp/pages/login/wxlogin.vue

@@ -202,11 +202,11 @@
                            url: './setInviteCode'
                        })
                    }
                    else if (e.data.userinfo.isPwd == 'N') {
                    /* else if (e.data.userinfo.isPwd == 'N') {
                        uni.redirectTo({
                            url: './setPass'
                        })
                    } else {
                    } */ else {
                        uni.switchTab({
                            url: '../index/index'
                        })

 uniapp/pages/rankinglist/common_act.vue

@@ -1,15 +1,24 @@
<template>
    <view>
        <web-view :webview-styles="webviewStyles" :src="webviewUrl" @message='received'></web-view>
        <web-view v-if="webshow" :webview-styles="webviewStyles" :src="webviewUrl" @message='received'></web-view>
        <!-- taobao -->
        <u-popup v-model="empowerModel" mode="center" border-radius="12">
          <empowerModel @closemodel='closeMdl' @updataInfo='updataUser'></empowerModel>
        </u-popup>
    </view>
    
</template>

<script>
     import empowerModel from '../../components/empowerModel.vue'
    var wv;
    export default {
        components: {
          empowerModel
        },
        data() {
            return {
                webshow:true,
                empowerModel: false,
                webviewUrl: '',
                user:'',
@@ -31,7 +40,6 @@
                 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);
                }
            }
@@ -45,9 +53,15 @@
            
            received(e) {
                var res=e.detail.data[0];
                 if(res.action=='back')
                console.log(res);
                switch(res.action)
                {
                    this.backLast();
                    case "back":
                        this.backLast();
                        break;
                    case "tbauth":
                        this.openTbMd();
                        break;
                }
            },
            backLast()
@@ -56,6 +70,22 @@
                    delta: 1
                });
            },
            closeMdl() {
              this.empowerModel = false;
              this.webshow=true;
            },
            openTbMd()
            {
                this.webshow=false;
                 this.empowerModel = true
            },
            updataUser() {
              var that = this;
              this.$u.api.getUserInfo({}).then(e => {
                utils.setCache('userInfo', e.data.userinfo)
                that.user = e.data.userinfo;
              }).catch(function(err) {})
            },
            // 关闭mui返回
              clearMuiBack() {
                // #ifdef APP-PLUS

 uniapp/pages/rankinglist/fengqiang.vue

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

 uniapp/pages/search/search.vue

@@ -27,7 +27,7 @@
                <view class="onlineStore-container rowCen" v-if="searchText==''">
                    <view class="onlineStoreList rowSta">
                        <block v-for="(items,index) in onlineStoreList" :key="index">
                            <view class="store-items colCen" :class="storeCurrent==index?'store-items-active':''" @click="checkstore(index)">
                            <view class="store-items colCen" :class="storeCurrent==items.inde?'store-items-active':''" @click="checkstore(items.inde)">
                                <view class="store-name">
                                    {{items.name}}
                                </view>
@@ -166,24 +166,30 @@
            return {
                onlineStoreList: [{
                        name: '淘宝',
                        type: 'tb'
                        type: 'tb',
                        inde:0
                    },
                    {
                        name: '京东',
                        type: 'jd'
                        type: 'jd',
                        inde:1
                    },
                    {
                        name: '拼多多',
                        type: 'pdd'
                    },
                    {
                        name: '唯品会',
                        type: 'vph'
                        type: 'pdd',
                        inde:2
                    },
                    {
                        name: '抖音',
                        type: 'dy'
                        type: 'dy',
                        inde:4
                    },
                    {
                        name: '唯品会',
                        type: 'vph',
                        inde:3
                    }
					
                ],
                searchText: '',
                storeCurrent: 0,

 uniapp/pages/search/searchResult.vue

@@ -23,8 +23,8 @@
                <view class="onlineStore-container rowCen">
                    <view class="onlineStoreList rowSta" v-if="!showtar || platform!='iOS'">
                        <block v-for="(items,index) in onlineStoreList" :key="index">
                            <view class="store-items colCen" :class="storeCurrent==index?'store-items-active':''"
                                @click="checkstore(index)">
                            <view class="store-items colCen" :class="storeCurrent==items.inde?'store-items-active':''"
                                @click="checkstore(items.inde)">
                                <view class="store-name">
                                    {{items.name}}
                                </view>
@@ -151,24 +151,30 @@
                advertPic: '',
                onlineStoreList: [{
                        name: '淘宝',
                        type: 'tb'
                        type: 'tb',
                        inde:0
                    },
                    {
                        name: '京东',
                        type: 'jd'
                        type: 'jd',
                        inde:1
                    },
                    {
                        name: '拼多多',
                        type: 'pdd'
                    },
                    {
                        name: '唯品会',
                        type: 'wph'
                        type: 'pdd',
                        inde:2
                    },
                    {
                        name: '抖音',
                        type: 'dy'
                        type: 'dy',
                        inde:4
                    },
                    {
                        name: '唯品会',
                        type: 'wph',
                        inde:3
                    }
					
                ],

                sortList: [{

 uniapp/utils/config.js

@@ -1,6 +1,6 @@
//const httpUrl = ""; // 接口域名
const httpUrl = "http://appapitest.ushopvip.com"; // 测试环境接口域名
//const httpUrl = "http://dfgapp.ushopvip.com"; // 生产环境接口域名
//const httpUrl = "http://appapitest.ushopvip.com"; // 测试环境接口域名
const httpUrl = "http://dfgapp.ushopvip.com"; // 生产环境接口域名
const salt = ""; 
export default {
    httpUrl:httpUrl,