no message

zhaojs

2023-05-19 a4c501780fb7c2179e7842cffda65756947ba951

no message

 uniapp/App.vue

@@ -171,13 +171,41 @@
            ...mapMutations(['login']),
            getAppInfo: function() {
                var that = this;
                // #ifdef APP-PLUS
                if (plus.os.name == 'iOS') {
                    if (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
                        that.globalData.ifwt = 0
                    } else {
                        if (plus.runtime.isApplicationExist({
                                action: 'weixin://'
                            }) && plus.runtime.isApplicationExist({
                                action: 'taobao://'
                            })) {
                            that.globalData.ifwt = 1 //是否安装微信和淘宝 1代表安装
                        } else {
                            that.globalData.ifwt = 0
                        }
                    }
                } else {
                    if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
                            action: 'weixin://'
                        })) {
                            console.log("安卓端已安装微信")
                        that.globalData.ifwt = 1 //是否安装微信 1代表安装
                    } else {
                        console.log("安卓端未安装微信")
                        that.globalData.ifwt = 0
                    }
                }
                // #endif
				
                this.$u.api.comminInt({}).then(e => {
                    if (e.code != 0) return that.$alert(e.msg)
                    that.globalData.appinfo = e.data.basic
                    utils.setCache('appInfo', e.data.basic)
                    utils.setCache('baseUrl', this.$u.http.config.baseUrl)
                    // #ifdef APP-PLUS
                    if (plus.os.name == 'iOS') {
                    /* if (plus.os.name == 'iOS') {
                        if (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
                            that.globalData.ifwt = 0
                        } else {
@@ -195,15 +223,16 @@
                        if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
                                action: 'weixin://'
                            })) {
                                console.log("安卓端已安装微信")
                            that.globalData.ifwt = 1 //是否安装微信 1代表安装
                        } else {
                            console.log("安卓端未安装微信")
                            that.globalData.ifwt = 0
                        }
                    }
                    } */
                    // #endif
                }).catch(function(err) {})

				
            },
        },
    }

 uniapp/manifest.json

@@ -2,8 +2,8 @@
    "name" : "大返官",
    "appid" : "__UNI__FC8858A",
    "description" : "大返官app",
    "versionName" : "1.0.7",
    "versionCode" : 107,
    "versionName" : "1.1.0",
    "versionCode" : 110,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 uniapp/pages.json

@@ -753,6 +753,10 @@
        {
            "path": "pages/login/wxlogin"
        },
        //填写邀请码
        {
            "path": "pages/login/setInviteCode"
        },
        {
            "path": "pages/mine/seckill",
            "style": {
@@ -858,8 +862,8 @@
            },
            {
                "pagePath": "pages/rankinglist/fengqiang",
                "iconPath": "static/images/tabBar/classify.png",
                "selectedIconPath": "static/images/tabBar/classifyActive.png",
                "iconPath": "static/images/tabBar/fqbico_un.png",
                "selectedIconPath": "static/images/tabBar/fqbico_in.png",
                "text": "疯抢榜"
            },
            {

 uniapp/pages/active/tmsearch.vue

@@ -8,7 +8,7 @@
                    
                </view>
                <view class="titleBox rowCen" :style="'color:'+ (scrollTop<fiexdtop?'#DD2425;':'#ffffff;')">
                    å¤©çŒ«
					
                </view>
                <view class="rightEmpty">
                </view>
@@ -18,11 +18,11 @@
            <view class="search-region colCen">
                <view class="pageTitle-bar rowCenCen">
                    <view class="leftIcon defIcon">
                        <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/tmlogo.png" mode="aspectFill"></image>
                        <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/tblogo.jpeg" mode="aspectFill"></image>
                    </view>
                    <view class="titleInfo colSta">
                        <view class="topfont">
                            å¤©çŒ«ä¼˜æƒ åˆ¸å¤§æ”¾é€
                            æ·˜å®ä¼˜æƒ åˆ¸å¤§æ”¾é€
                        </view>
                        <view class="bottomfont">
                            å…ˆé¢†åˆ¸ å†è´­ç‰© çœåƒå…ƒ
@@ -202,7 +202,7 @@
            top: 0;
            left: 0;
            z-index: 110;
            background: linear-gradient(266deg, #E7251C, #E7251C);
            background: linear-gradient(266deg, #F97B24, #F97B24);

            .headerBar-container {
                width: 100%;
@@ -235,7 +235,7 @@
                width: 100%;
                height: 340rpx;
                padding: 0 75rpx;
                background: linear-gradient(266deg, #E7251C, #E7251C);
                background: linear-gradient(266deg, #F97B24, #F97B24);

                .pageTitle-bar {
                    width: 100%;
@@ -291,7 +291,7 @@
                    .right-btn {
                        width: 116rpx;
                        height: 60rpx;
                        background: linear-gradient(266deg, #FF012E, #FF1017);
                        background: linear-gradient(266deg, #F97B24, #F97B24);
                        border-radius: 30rpx;
                        font-size: 24rpx;
                        font-weight: 500;

 uniapp/pages/index/index.vue

@@ -122,8 +122,24 @@
            }
        },
        onLoad() {
            this.getCategoryList();
            this.getPopBannerInfo()
            if(!this.hasLogin){
                uni.reLaunch({
                    url:"/pages/login/wxlogin"
                })
            }
            var user= uni.getStorageSync('userInfo');
            if(!user.invitation_code)
            {
                uni.reLaunch({
                    //url:"/pages/login/setInviteCode"
                    url:"/pages/login/wxlogin"
                })
            }
            else
            {
                this.getCategoryList();
                this.getPopBannerInfo();
            }
        },
        onShow() {
            if(this.categoryList){

 uniapp/pages/login/bindingPhone.vue

@@ -103,6 +103,33 @@
                    })
                }
            },
            targetToIndex(e)
            {
                var that = this;
				
                that.login(e.data.userinfo);
                utils.setCache('userInfo', e.data.userinfo)
                getApp().globalData.userInfo = e.data.userinfo
                that.$alert('登录成功')
                setTimeout(function(){
                    console.log(e.data.userinfo)
                    if(!e.data.userinfo.invitation_code)
                    {
                        uni.redirectTo({
                            url: './setInviteCode'
                        })
                    }
                    else if (e.data.userinfo.isPwd == 'N') {
                        uni.redirectTo({
                            url: './setPass'
                        })
                    } else {
                        uni.switchTab({
                            url: '../index/index'
                        })
                    }
                },1000)
            },
            bindMobile(){
                var that = this;
                if(!this.hasLogin && this.wxUser != ""){
@@ -113,7 +140,8 @@
                    }).then(e => {
                        console.log(e)
                        if (e.code != 0) return that.$alert(e.msg)
                        that.login(e.data.userinfo);
                        this.targetToIndex(e);
                        /* that.login(e.data.userinfo);
                        that.$alert('登录成功')
                        setTimeout(function() {
                            if (e.data.userinfo.isPwd ==
@@ -126,7 +154,7 @@
                                    url: '../index/index'
                                })
                            }
                        }, 1000)
                        }, 1000) */
                    }).catch(function (err) {
                        console.log(err)
                    })

 uniapp/pages/login/login.vue

@@ -23,7 +23,6 @@
                    </view>
                </view>
            </view>

            <view class="input-container colCen" v-else>
                <view class="outSidebox rowCenBet" data-type='pass' :class="selectedInput=='code'?'outSidebox-active':''">
                    <input @focus="changeType" @blur="cleanActive" data-type='code' type="number" v-model="code" placeholder="请输入验证码"
@@ -105,6 +104,7 @@
                
                if(this.isread){
                    if (this.ifPasslogin) {
                        //密码登录
                        var param = {
                            account: this.phone,
                            password: this.pass,
@@ -112,23 +112,27 @@
                        }
                        this.$u.api.login(param).then(e => {
                            if(e.code != 0) return that.$alert(e.msg)
                            that.login(e.data.userinfo);
                            this.targetToIndex(e);
                            /* that.login(e.data.userinfo);
                            that.$alert('登录成功')
                            setTimeout(function(){
                                uni.switchTab({
                                    url: '../index/index'
                                });
                            },1000)
                            },1000) */
                        }).catch(function (err) {
                        })
                    } else {
                        //验证码登录
                        this.$u.api.mobileLogin({
                            mobile: this.phone,
                            captcha: this.code,
                            push_cid:this.clientid
                        }).then(e => {
                            if(e.code != 0) return that.$alert(e.msg)
                            that.login(e.data.userinfo);
                            if(e.code != 0) return that.$alert(e.msg)
                            this.targetToIndex(e);
                            /* that.login(e.data.userinfo);
                            utils.setCache('userInfo', e.data.userinfo)
                            getApp().globalData.userInfo = e.data.userinfo
                            that.$alert('登录成功')
@@ -142,7 +146,7 @@
                                        url: '../index/index'
                                    })
                                }
                            },1000)
                            },1000) */
                            
                        }).catch(function (err) {
                        })
@@ -190,6 +194,34 @@
                    });
                }
            },
			
            targetToIndex(e)
            {
                var that = this;
				
                that.login(e.data.userinfo);
                utils.setCache('userInfo', e.data.userinfo)
                getApp().globalData.userInfo = e.data.userinfo
                that.$alert('登录成功')
                setTimeout(function(){
                    console.log(e.data.userinfo)
                    if(!e.data.userinfo.invitation_code)
                    {
                        uni.redirectTo({
                            url: './setInviteCode'
                        })
                    }
                    else if (e.data.userinfo.isPwd == 'N') {
                        uni.redirectTo({
                            url: './setPass'
                        })
                    } else {
                        uni.switchTab({
                            url: '../index/index'
                        })
                    }
                },1000)
            },

            showPassfnc() {
                this.showPass = !this.showPass

 uniapp/pages/login/setInviteCode.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,244 @@
<template style="background:#fff">
    <view class="invite-code-container colCen borderBox">
        <view class="model-title rowCenCen">
            è¯·è¾“入邀请码
        </view>
        <view class="grey-input-content rowCen borderBox">
            <input class="iptclas" type="text" v-model="inviteCode" placeholder="请填写邀请码" placeholder-class="pla-input"/>
        </view>
        <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>
		
        <view class="yqmtip rowCenCen">
            <span @click="showinvite">没有邀请码？</span>
        </view>
        <u-popup v-model="inviterShow" mode="center" border-radius="32" v-if="inviterShow" :mask-close-able='true'>
            <inviter-model ref='invitermodel' @rewrite='rewriteCode' @setInvite='setCodebtn'></inviter-model>
        </u-popup>
	
    </view>
</template>

<script>
        import inviterModel from '../../components/inviterModel.vue'
        import util from '../../utils/utils.js'
    export default {
        components: {
            inviterModel
        },
        data(){
            return{
                isShowCode:false,
                inviteCode:'',
                appInfo:'',
                inviterShow:false
            }
        },
        mounted() {
            this.appInfo = uni.getStorageSync('appInfo')
        },
        methods: {
            useCode()
            {
                this.inviteCode=this.appInfo.officialInvitationCode;
            },
            rewriteCode()
            {
                this.inviterShow=false;
            },
            setCodebtn(){
                this.inviterShow=false;
                this.getuserInfo()
            },
            showinvite() {
                var that=this;
                uni.showModal({
                    title: '温馨提示',
                    content: "您可向推荐您使用大返官的好友获取邀请码~",
                    cancelText:'没有推荐人',
                    confirmText:'联系推荐人',
                    success:function(res)
                    {
                        that.isShowCode=res.cancel;
                        console.log(that.isShowCode)
                    }
                });
            },
            getuserInfo() {
                var that = this;
                this.$u.api.getUserInfo({}).then(e => {
                    console.log(e)
                    util.setCache('userInfo', e.data.userinfo);
                    if (e.data.userinfo.isPwd == 'N') {
                        uni.redirectTo({
                            url: './setPass'
                        })
                    } else {
                        uni.switchTab({
                          url: '../index/index'
                        })
                    }
                }).catch(function (err) {
                    console.log(err)
                })
            },
            setCode()
            {
                var that=this;
                if(this.inviteCode)
                {
                    this.$u.api.getInviteInfo({
                        invite_code:this.inviteCode
                    }).then(e => {
                        console.log(e)
                        if(e.code != 0) return that.$alert(e.msg)
                        uni.setStorageSync('inviterInfo',e.data)
                        this.inviterShow = true
                    }).catch(function (err) {
                    })
                }
            }

        }
    }
</script>

<style lang="scss">
    body
    {
        background: #fff;
    }
	
    .yqmtip
    {
        width: 100%;
        position: fixed;
        bottom: 100rpx;
        bottom: calc(100rpx + constant(safe-area-inset-bottom));
        bottom: env(100rpx + constant(safe-area-inset-bottom));
        left: 0;
        z-index: 1;
        color: #999999;
    }
    .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;
                }
            }
            .colorfulbtn {
                background: #FD002F;
                pointer-events: auto;
            }
    .invite-code-container{
        background: #FFFFFF;
        padding: 0 46rpx;
        .model-title{
            width: 100%;
            height: 135rpx;
            font-size: 54rpx;
            font-weight: 500;
            color: #333333;
            margin-top: 250rpx;
        }
        .grey-input-content{
            width: 100%;
            height: 90rpx;
            background: #F8F8F8;
            border-radius: 45rpx;
            padding: 0 21rpx;
            margin-bottom: 35rpx;
            .iptclas{
                flex: 1;
            }
            .pla-input{
                font-size: 28rpx;
                font-weight: 500;
                color: #999999;
            }
        }
		
        .btn-bar{
            width: 100%;
            margin-bottom: 50rpx;
            .close-btn{
                width: 263rpx;
                height: 90rpx;
                background: #F7F7F7;
                border: 1rpx solid #CBCBC9;
                border-radius: 45rpx;
                font-size: 28rpx;
                font-weight: 500;
                color: #999999;
            }
            .next-btn{
                width: 263rpx;
                height: 90rpx;
                background: #CBCBC9;
                border-radius: 45rpx;
                font-size: 28rpx;
                font-weight: 500;
                color: #FFFFFF;
            }
            .pinkbtn{
                background-color: #FD002F;
            }
        }
		
        .model-tips{
            width: 100%;
            font-size: 24rpx;
            font-weight: 500;
            color: #999999;
            margin-bottom: 25rpx;
        }
		
        .copy-bar{
            width: 100%;
            height: 72rpx;
            background: #F8F8F8;
            border-radius: 12rpx;
            margin-bottom: 30rpx;
            padding: 0 20rpx;
            .left-code{
                font-size: 26rpx;
                font-weight: 500;
                color: #FF002C;
            }
            .copybtn{
                width: 158rpx;
                height: 54rpx;
                background: #FFFFFF;
                border-radius: 12rpx;
                font-size: 26rpx;
                font-weight: 500;
                color: #333333;
            }
        }
    }
</style>

 uniapp/pages/login/wxlogin.vue

@@ -62,6 +62,32 @@
                    })
                }
            },
            targetToIndex(e)
            {
                var that = this;
				
                that.login(e.data.userinfo);
			
                that.$alert('登录成功')
                setTimeout(function(){
                    console.log(e.data.userinfo)
                    if(!e.data.userinfo.invitation_code)
                    {
                        uni.redirectTo({
                            url: './setInviteCode'
                        })
                    }
                    else if (e.data.userinfo.isPwd == 'N') {
                        uni.redirectTo({
                            url: './setPass'
                        })
                    } else {
                        uni.switchTab({
                            url: '../index/index'
                        })
                    }
                },1000)
            },
            wxlogin() {
                var that = this;
                if (this.isread) {
@@ -80,20 +106,7 @@
                                            if (e.code != 0) return that.$alert(e.msg)
                                            var res = e.data;
                                            if(res.type == 'goUser'){
                                                that.login(e.data.userinfo);
                                                that.$alert('登录成功')
                                                setTimeout(function() {
                                                    if (res.userinfo.isPwd ==
                                                        'N') {
                                                        uni.redirectTo({
                                                            url: './setPass'
                                                        })
                                                    } else {
                                                        uni.switchTab({
                                                            url: '../index/index'
                                                        })
                                                    }
                                                }, 1000)
                                                this.targetToIndex(e);
                                            }else if(res.type == 'bindMobile'){
                                                uni.navigateTo({
                                                    url: "./bindingPhone?wx="+encodeURIComponent(JSON.stringify(res.info))

 uniapp/pages/mine/mine.vue

@@ -129,7 +129,7 @@
                <swiper class="banerContent" :autoplay="true" :interval="3000" :duration="1000" circular>
                    <swiper-item v-for="(items,index) in bannerList" :key="index" @tap="goUrl(items)">
                        <view class="swiper-items defIcon">
                            <image :src="items.pic" mode="aspectFit"></image>
                            <image :src="items.image" mode="aspectFit"></image>
                        </view>
                    </swiper-item>
                </swiper>
@@ -322,12 +322,12 @@
                    console.log(err)
                })
            },

            getbanner() {
                // banner数据
                var that = this;
                this.$u.api.getBanner({type:'2'}).then(e => {
                    if(e.code == 1)return that.$alert(e.msg);
                    console.log(e.data.info)
                    that.bannerList = e.data.info;
                }).catch(function (err) {
                })
@@ -381,7 +381,40 @@
            },

            goUrl(info) {
                util.goUrl(info,this)
                console.log(info)
                if(info.url_type == 15)
                {//微信客服
                    let wechat = null
                    let parameter = info.parameter_json;
                    plus.share.getServices(res => {
                        wechat = res.find(i => i.id === 'weixin')
                        if (wechat) {
                            wechat.openCustomerServiceChat({
                                corpid: parameter.cmark, //企业ID
                                url: parameter.url, //客服地址
                            }, src => {
                                console.log("success:", JSON.stringify(src))
                            }, err => {
                                console.log("error:", JSON.stringify(err))
                            })
                        } else {
                            uni.showToast({
                                title: '当前环境不支持微信操作',
                                icon: "error"
                            });
                        }
                    }, function() {
                        uni.showToast({
                            title: "获取服务失败，不支持该操作。" + JSON.stringify(e),
                            icon: 'none'
                        })
                        });
                }
                else
                {
                    util.goUrl(info,this)
                }
				
            },

            

 uniapp/pages/mine/mt.vue

@@ -21,14 +21,14 @@
        </view>

        <view class="options-bar-content rowCenCen">
            <view class="center-container rowCenBet">
                <block v-for="(items,index) in optionsList" :key="index">
            <!-- <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">
@@ -55,16 +55,15 @@
                è§„则说明：
            </view>
            <view class="richtext-content">
                1.本次活动中红包领取时间截止至2021å¹´12月31日24点;</br>
                2.此活动为部分区域有效，以活动页面实际展示为准;红包发放数量及红包金额具有随机性;具体红包使用有效期及红包金额以实际收到为准;</br>
                3.红包使用规则:</br>
                1.此活动为部分区域有效，以活动页面实际展示为准;红包发放数量及红包金额具有随机性;具体红包使用有效期及红包金额以实际收到为准;</br>
                2.红包使用规则:</br>
                (1)红包使用门槛、使用期限及使用规则等以红包券面展示信息为准;</br>
                (2)红包可在美团或美团外卖最新版客户端、美团外卖小程序下单且选择在线支付时使用;且红包仅限非到店自取外卖订单，下午茶、夜宵、美食、蛋糕、团餐频道、甜点
                é¥®å“é¢‘道使用; </br>
                (3)外卖新人首单红包限新用户(设备、手机号、 çº¢åŒ…
                å·å‡æœªåœ¨ç¾Žå›¢å¤–卖下过单)首次下单使用，且不与其他优惠(首减、满减、满赠、套餐增、折扣菜)同享;非首单红包可与上述优惠叠加使用;</br>
                (4)使用红包时下单手机号码必须与收餐人手机号码、领取红包时输入的手机号码一致:</br>
                4.订单跟单规则为您通过本活动页点击跳转至美团后只要产生有效点击即可进行跟单，点击有效期最长为7天</br>
                3.订单跟单规则为您通过本活动页点击跳转至美团后只要产生有效点击即可进行跟单，点击有效期最长为7天</br>
            </view>
        </view>
    </view>
@@ -79,14 +78,15 @@
                optionsList: [{
                        label: "外卖",
                        type: 1
                    },
                    }
                /*     ,
                    {
                        label: "商超",
                        type: 2
                    }, {
                        label: "优选",
                        type: 3
                    }
                    } */
                ],
                mtInfo: null,
                wxQrcodeUrl: ''

 uniapp/pages/rankinglist/fengqiang.vue

@@ -18,10 +18,16 @@
            }
        },
        onLoad(options) {
            //console.log(options);
            const value = uni.getStorageSync('userInfo');
            console.log(value.token);
            this.webviewUrl = encodeURI('http://dfgapp.ushopvip.com/html/fengqiangbang.html?token='+value.token);
            if(!this.hasLogin){
                uni.reLaunch({
                    url:"/pages/login/wxlogin"
                })
            }
            else{
                const value = uni.getStorageSync('userInfo');
                this.webviewUrl = encodeURI('http://dfgapp.ushopvip.com/html/fengqiangbang.html?token='+value.token);
            }
			
        },
        onReady() {
          this.clearMuiBack();

 uniapp/static/images/tabBar/find.png

 uniapp/static/images/tabBar/fqbico_in.png

 uniapp/static/images/tabBar/fqbico_un.png

 uniapp/static/images/tabBar/talentSay.png

 uniapp/utils/utils.js

@@ -211,6 +211,7 @@
                })
            }
        }
		
    } else {
        uni.redirectTo({
            url: '/pages/login/wxlogin'