zhao_js
2023-11-15 b44e169dd8a6e0f15d3788970176922e96aec6e1
no message
已修改7个文件
89 ■■■■ 文件已修改
uniapp/App.vue 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
uniapp/components/indexPage.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
uniapp/manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
uniapp/nativeplugins/xiguazhu-baichuan/android/res/drawable/yw_1222_baichuan.jpg 补丁 | 查看 | 原始文档 | blame | 历史
uniapp/pages/goods/goodsDetail.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
uniapp/pages/login/login.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
uniapp/utils/http.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
uniapp/App.vue
@@ -33,11 +33,12 @@
                    } else { //APP在线,收到消息不会包含type属性,这时的payload是JSON字符串,需要转为JSON对象  
                        payload = JSON.parse(msg.payload);
                    }
                    console.log(payload);
                    if (payload != null || payload != undefined) {
                        // var messageType = payload.messageType; 
                        // onLaunch 生命周期里,页面跳转有问题,跳不过去
                        // 应该是页面还没加载,加上定时后,就可以了;
                        console.log(payload);
                        setTimeout(() => {
                            uni.navigateTo({
                                url: payload
@@ -46,6 +47,7 @@
                    }
                } else { // Android
                    var payload = msg.payload;
                    console.log(payload);
                    if (payload != null || payload != undefined) {
                        // onLaunch 生命周期里,页面跳转有问题,跳不过去
                        // 应该是页面还没加载,加上定时后,就可以了; 
@@ -74,12 +76,18 @@
                        });
                    }
                } else { // Android
                    var payload = JSON.parse(msg.content);
                    console.log(msg.content);
                    plus.push.createMessage(msg.content, msg.payload, {
                        title: messageTitle
                        //icon:'/static/images/app/pushlogo.png'
                    });
                    /* var payload = JSON.parse(msg.content);
                    var messageTitle = payload.title;
                    var messageContent = payload.content;
                    plus.push.createMessage(messageContent, payload, {
                        title: messageTitle
                    })
                    }) */
                }
            }, false);
            //消息推送结束
@@ -134,8 +142,8 @@
                    // #endif
                }
            })
        },
        globalData: {
            platform: '',
@@ -151,9 +159,9 @@
            argumentStr: ''
        },
        data(){
        data() {
            return {
            }
        },
        onShow: function() {
@@ -198,7 +206,8 @@
            ...mapMutations(['login']),
            bcInit: function() {
                var that = this;
                if (uni.getSystemInfoSync().platform == 'ios') {
                //uni.getSystemInfoSync().platform == 'ios'
                if (true) {
                    const plug = uni.requireNativePlugin('xiguazhu-baichuan');
                    plug.init({}, result => {
                        //console.log('1111111111111111111');
@@ -211,13 +220,15 @@
                    that.globalData.hasbcinit = true;
                }
            },
            targetArgument(args){
            targetArgument(args) {
                var toarg = args.replace('dafanguan://', '');
                var argObj = JSON.parse(decodeURIComponent(toarg));
                uni.navigateTo({
                    url: toarg
                });
                /* var argObj = JSON.parse(decodeURIComponent(toarg));
                switch (argObj.totype) {
                    case "0": //内链
                        if(argObj.url)
                        {
                        if (argObj.url) {
                            uni.navigateTo({
                                url: argObj.url
                            });
@@ -225,19 +236,17 @@
                        break;
                    default:
                        break;
                }
                } */
            },
            getArgument(isload=false) {
                if(this.globalData.argumentStr&&this.globalData.argumentStr.length>0)
                {
            getArgument(isload = false) {
                if (this.globalData.argumentStr && this.globalData.argumentStr.length > 0) {
                    return;
                }
                try {
                    var args = plus.runtime.arguments;
                    console.log(args);
                    if (args) {
                        if(isload)
                        {
                        if (isload) {
                            this.globalData.argumentStr = args;
                            return;
                        }
@@ -267,7 +276,7 @@
            updatePushCid: function() {
                let clientInfo = uni.getStorageSync('clientInfo');
                if (clientInfo && clientInfo != 'null' && clientInfo.clientid) {
                    console.log('开始更新:'+clientInfo.clientid);
                    console.log('开始更新:' + clientInfo.clientid);
                    this.$u.api.updateCid({
                        pushcid: clientInfo.clientid
                    }).then(e => {}).catch(function(err) {})
@@ -314,7 +323,7 @@
                            that.globalData.ifwt = 0
                        }
                    }
                    // #endif
                }).catch(function(err) {
                    that.globalData.hasinit = false;
uniapp/components/indexPage.vue
@@ -797,6 +797,7 @@
                var that = this;
                if(type==7&&that.preferData)
                {//猜你喜欢
                console.log(that.preferData);
                    this.$u.api.gussessLikeGoods({
                        platefrom:that.preferData.p_platefrom,
                        cids:that.preferData.p_cids,
uniapp/manifest.json
@@ -2,8 +2,8 @@
    "name" : "大返官",
    "appid" : "__UNI__FC8858A",
    "description" : "大返官app",
    "versionName" : "1.2.7",
    "versionCode" : 127,
    "versionName" : "1.1.6",
    "versionCode" : 116,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
uniapp/nativeplugins/xiguazhu-baichuan/android/res/drawable/yw_1222_baichuan.jpg

uniapp/pages/goods/goodsDetail.vue
@@ -589,6 +589,7 @@
            this.inviteCodeShow = true
          } else {
            console.log(this.pageType)
            console.log(this.user.tb_account)
            if (this.pageType == 'tb' || this.pageType == 'tmshop' || this.pageType == 'tm') {
              if (this.user.tb_account) {
                this.getTbsrc()
@@ -647,6 +648,7 @@
          goodsId: this.optionsInfo.goodsId,
          type: 0
        }).then(e => {
          if (e.code != 0) return that.$alert(e.msg)
          if(that.frompage=='freebuy')
          {//0元购的记录商品id
@@ -667,12 +669,14 @@
              pname: 'com.taobao.taobao',
              action: 'taobao://'
            })) {
            const plug = uni.requireNativePlugin('xiguazhu-baichuan')
             console.log(tburl);
            plug.detailPage({
              url: tburl,
              "openType": 0
            }, result => {
              //  console.log(result);
              console.log(result);
            });
          } else {
            uni.navigateTo({
uniapp/pages/login/login.vue
@@ -40,9 +40,9 @@
            </view>
            <view class="bottom-fixed colCen">
                <!-- <view class="verification-Code" @click="changeWay()">
                <view v-if="issh" class="verification-Code" @click="changeWay()">
                    {{ifPasslogin?'验证码':'密码'}}登录
                </view> -->
                </view>
                <view class="explain-text rowCen">
                    <switch type="checkbox" @change="changeread" :checked='isread' style="transform:scale(0.6)"/>
                    登陆代表已详细阅读并同意<text @click="goPage('agreement')">《用户协议》</text>和<text @click="goPage('policy')">《隐私政策》</text>
@@ -66,6 +66,7 @@
        },
        data() {
            return {
                issh:false,
                ifPasslogin: false,
                pass: '',
                phone: '',
@@ -81,7 +82,7 @@
            };
        },
        onLoad() {
            this.shShow();
        },
        methods: {
            ...mapMutations(['login']),
@@ -93,6 +94,27 @@
            changeread(e){
                this.isread = e.target.value
            },
            shShow()
            {
                var that=this;
                this.$u.api.comminInt({}).then(e => {
                    console.log(e)
                    that.hasshow=true;
                    // #ifdef APP-PLUS
                    if (plus.os.name == 'iOS') {
                        if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
                            console.log('1')
                            that.issh=true;
                        } else {
                            console.log(0)
                            that.issh=false;
                        }
                    }
                    // #endif
                }).catch(function(err) {
                    console.log(err);
                })
            },
            dologin() {
                var that = this;
                let clientInfo = uni.getStorageSync('clientInfo');
uniapp/utils/http.js
@@ -46,6 +46,7 @@
    } catch (e) {
        TOKEN = ''
    }
    //TOKEN='fba93d1f-9bbe-49e7-9df7-074ddaba8790';
    var startTime = new Date();
    return new Promise((succ, error) => {
        uni.request({