Merge tag '1.1.2发布' into develop

zhaojs

2023-06-10 02e9a944bf709ccfb9e46c163cf56e38452ca464

Merge tag '1.1.2发布' into develop

 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

@@ -67,7 +67,7 @@
                        <!--左轮播，右两行-->
                        <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" circular>
                                <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>

 uniapp/manifest.json

@@ -2,8 +2,8 @@
    "name" : "大返官",
    "appid" : "__UNI__FC8858A",
    "description" : "大返官app",
    "versionName" : "1.1.2",
    "versionCode" : 112,
    "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/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">
@@ -297,6 +300,7 @@
        platform: '',
        inviteCodeShow: 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/mine/elm.vue

@@ -140,7 +140,7 @@
                    this.activeIndex = index
                    if(this.optionsCurrent == 0)
                    {
                        uni.navigateTo({
                        uni.redirectTo({
                            url:'./mt'
                        })
                        return;

 uniapp/pages/mine/mt.vue

@@ -144,7 +144,7 @@
                    this.optionsCurrent = type
                    if(this.optionsCurrent==2)
                    {//跳转饿了么
                        uni.navigateTo({
                        uni.redirectTo({
                            url:'./elm'
                        })
                        return;

 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

@@ -1,15 +1,19 @@
<template>
    <view>
        <web-view :webview-styles="webviewStyles" :src="webviewUrl" @message='received'></web-view>
		
    </view>
	
</template>

<script>
    var wv
    var wv;
    export default {
        data() {
            return {
                empowerModel: false,
                webviewUrl: '',
                user:'',
                webviewStyles: {
                    progress: {
                        color: '#EE1B14'
@@ -25,9 +29,10 @@
            }
            else{
                const value = uni.getStorageSync('userInfo');
                console.log(value);
                 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);
                }
            }
@@ -36,45 +41,21 @@
        onReady() {
          this.clearMuiBack();
        },
		
        methods: {
			
            received(e) {
                console.log(e);
                var res=e.detail.data[0];
                if(res.action=='target_tb')
                 if(res.action=='back')
                {
                    this.getTbsrc(res.data.goodsId);
                    this.backLast();
                }
            },
            //跳转淘宝
            getTbsrc(goodsid) {
              var that = this;
              this.$u.api.getPrivilegeLink({
                goodsId: goodsid,
                type: 0
              }).then(e => {
                  console.log(e);
                if (e.code != 0) return that.$alert(e.msg)
                var res = e.data.info;
                var tburl = res.shortUrl
                // #ifdef APP-PLUS
                if (plus.runtime.isApplicationExist({
                    pname: 'com.taobao.taobao',
                    action: 'taobao://'
                  })) {
                  const plug = uni.requireNativePlugin('xiguazhu-baichuan')
                  plug.detailPage({
                    url: tburl,
                    "openType": 0
                  }, result => {
                    //  console.log(result);
                  });
                } else {
                  uni.navigateTo({
                    url: '../webView/webView?url=' + tburl
                  })
                }
                // #endif
              }).catch(function(err) {})
            backLast()
            {
                uni.navigateBack({
                    delta: 1
                });
            },
            // å…³é—­mui返回
              clearMuiBack() {

 uniapp/utils/config.js

@@ -1,5 +1,6 @@
//const httpUrl = ""; // æŽ¥å£åŸŸå
const httpUrl = "http://appapitest.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

@@ -99,6 +99,7 @@
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
@@ -204,8 +205,11 @@
    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 = {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};
    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 {