From 83e49ed8b1ab05dd332def0fba6c3703d1e91373 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 11 八月 2023 16:32:28 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.5开发' into develop
---
uniapp/manifest.json | 8
uniapp/pages/mine/inviteFriends.vue | 2
uniapp/App.vue | 177 +++++++++++++--------
uniapp/pages/mine/elm.vue | 4
uniapp/utils/http.api.js | 5
uniapp/pages/index/categories.vue | 3
uniapp/pages/index/index.vue | 239 +++++++++++++++++------------
7 files changed, 257 insertions(+), 181 deletions(-)
diff --git a/uniapp/App.vue b/uniapp/App.vue
index adf7563..ac5afb2 100644
--- a/uniapp/App.vue
+++ b/uniapp/App.vue
@@ -11,7 +11,7 @@
// #endif
export default {
onLaunch: function() {
-
+
// #ifdef APP-PLUS
//鎺ㄩ�佸紑濮�
/* var info = plus.push.getClientInfo()
@@ -33,6 +33,7 @@
} else { //APP鍦ㄧ嚎锛屾敹鍒版秷鎭笉浼氬寘鍚玹ype灞炴��,杩欐椂鐨刾ayload鏄疛SON瀛楃涓诧紝闇�瑕佽浆涓篔SON瀵硅薄
payload = JSON.parse(msg.payload);
}
+ console.log(payload);
if (payload != null || payload != undefined) {
// var messageType = payload.messageType;
// onLaunch 鐢熷懡鍛ㄦ湡閲岋紝椤甸潰璺宠浆鏈夐棶棰�,璺充笉杩囧幓
@@ -129,10 +130,12 @@
this.globalData.systemLevel = e.system;
this.globalData.equipmentNumber = idfa.value()
};
+ this.getArgument(true);
// #endif
}
})
-
+
+
},
globalData: {
platform: '',
@@ -142,27 +145,31 @@
canlisten: true,
appinfo: {},
ifwt: 0,
- hasinit:false,
- hasbcinit:false,
- isLaunch:false
-
+ hasinit: false,
+ hasbcinit: false,
+ isLaunch: false,
+ argumentStr: ''
+
+ },
+ data(){
+ return {
+
+ }
},
onShow: function() {
var that = this;
uni.getNetworkType({
- success:function(res){
+ success: function(res) {
if (res.networkType == 'none') {
uni.showModal({
title: '缃戠粶閾炬帴澶辫触',
content: '妫�娴嬪埌缃戠粶鏉冮檺鍙兘璁剧疆涓哄叧闂紝鎮ㄥ彲浠ュ湪鈥滆缃�濅腑妫�鏌ユ棤绾挎暟鎹強铚傜獫绉诲姩缃戠粶'
})
- }else{
- if(!that.globalData.hasinit)
- {
+ } else {
+ if (!that.globalData.hasinit) {
that.getAppInfo();
}
- if(!that.globalData.hasbcinit)
- {
+ if (!that.globalData.hasbcinit) {
console.log("鍒濆鍖栫櫨宸濇彃浠�")
that.bcInit();
}
@@ -179,44 +186,77 @@
var route = routes[routes.length - 1].route
}
// #ifdef APP-PLUS
- if (this.globalData.canlisten && route != 'pages/mine/tools/turnChain'&&route!='pages/rankinglist/compareprice') {
+ if (this.globalData.canlisten && route != 'pages/mine/tools/turnChain' && route !=
+ 'pages/rankinglist/compareprice') {
getClipboard()
}
-
+ that.getArgument();
// #endif
},
onHide: function() {},
methods: {
...mapMutations(['login']),
- bcInit:function()
- {
+ bcInit: function() {
var that = this;
- if (uni.getSystemInfoSync().platform == 'ios')
- {
+ if (uni.getSystemInfoSync().platform == 'ios') {
const plug = uni.requireNativePlugin('xiguazhu-baichuan');
plug.init({}, result => {
//console.log('1111111111111111111');
- console.log(result); // code绛変簬0灏辨槸鍒濆鍖栨垚鍔�
- if(result.code==0)
- {
- that.globalData.hasbcinit=true;
+ console.log(result); // code绛変簬0灏辨槸鍒濆鍖栨垚鍔�
+ if (result.code == 0) {
+ that.globalData.hasbcinit = true;
}
});
- }
- else{
- that.globalData.hasbcinit=true;
+ } else {
+ that.globalData.hasbcinit = true;
}
},
- getPushCid:function()
- {
+ targetArgument(args){
+ var toarg = args.replace('dafanguan://', '');
+ var argObj = JSON.parse(decodeURIComponent(toarg));
+ switch (argObj.totype) {
+ case "0": //鍐呴摼
+ if(argObj.url)
+ {
+ uni.navigateTo({
+ url: argObj.url
+ });
+ }
+ break;
+ default:
+ break;
+ }
+ },
+ 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)
+ {
+ this.globalData.argumentStr = args;
+ return;
+ }
+ plus.runtime.arguments = "";
+ plus.runtime.arguments = null;
+ this.targetArgument(args);
+ }
+ } catch (es) {
+ console.log(es)
+ }
+
+ },
+ getPushCid: function() {
// #ifdef APP-PLUS
var info = plus.push.getClientInfo()
- if(info&&info.clientid!='null')
- {// 鑾峰彇褰撳墠璁惧鐨勫鎴风id,浼犵粰鍚庡彴,瀹炵幇鎸囧畾鐢ㄦ埛
+ if (info && info.clientid != 'null') { // 鑾峰彇褰撳墠璁惧鐨勫鎴风id,浼犵粰鍚庡彴,瀹炵幇鎸囧畾鐢ㄦ埛
uni.setStorageSync('clientInfo', info);
this.updatePushCid();
- }
- else{
+ } else {
console.log('娌℃湁鑾峰彇鍒�');
setTimeout(() => {
this.getPushCid();
@@ -224,38 +264,33 @@
}
// #endif
},
- updatePushCid:function()
- {
+ updatePushCid: function() {
let clientInfo = uni.getStorageSync('clientInfo');
- if(clientInfo&&clientInfo!='null'&&clientInfo.clientid)
- {
- console.log('寮�濮嬫洿鏂�');
+ if (clientInfo && clientInfo != 'null' && clientInfo.clientid) {
+ console.log('寮�濮嬫洿鏂�:'+clientInfo.clientid);
this.$u.api.updateCid({
- pushcid:clientInfo.clientid
- }).then(e => {
- }).catch(function (err) {
- })
- }
- else{
+ pushcid: clientInfo.clientid
+ }).then(e => {}).catch(function(err) {})
+ } else {
this.getPushCid();
}
-
+
},
getAppInfo: function() {
var that = this;
- that.globalData.hasinit=true;
+ that.globalData.hasinit = true;
this.$u.api.comminInt({}).then(e => {
- if (e.code != 0)
- {
- that.globalData.hasinit=false;
+ if (e.code != 0) {
+ that.globalData.hasinit = false;
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 (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
+ 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({
@@ -269,7 +304,8 @@
}
}
} else {
- if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
+ if (plus.runtime.isApplicationExist({
+ pname: 'com.tencent.mm',
action: 'weixin://'
})) {
that.globalData.ifwt = 1 //鏄惁瀹夎寰俊 1浠ｈ〃瀹夎
@@ -278,26 +314,29 @@
that.globalData.ifwt = 0
}
}
+
// #endif
- }).catch(function(err) {that.globalData.hasinit=false;})
-
+ }).catch(function(err) {
+ that.globalData.hasinit = false;
+ })
+
},
-
- watch:function(method,istr){
- var obj=this.globalData
- console.log(obj)
- Object.defineProperty(obj,istr,{
- configurable:true,
- enumerable:true,
- set:function(value){
- this._consumerGoodsStatus=value
- method(value)
- },
- get:function(value){
- return this._consumerGoodsStatus
- }
- })
- },
+
+ watch: function(method, istr) {
+ var obj = this.globalData
+ console.log(obj)
+ Object.defineProperty(obj, istr, {
+ configurable: true,
+ enumerable: true,
+ set: function(value) {
+ this._consumerGoodsStatus = value
+ method(value)
+ },
+ get: function(value) {
+ return this._consumerGoodsStatus
+ }
+ })
+ },
},
}
</script>
@@ -319,4 +358,4 @@
}
/* #endif */
-</style>
+</style>
\ No newline at end of file
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index a97b06a..2f829fe 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -2,8 +2,8 @@
"name" : "澶ц繑瀹�",
"appid" : "__UNI__FC8858A",
"description" : "澶ц繑瀹榓pp",
- "versionName" : "1.1.4",
- "versionCode" : 114,
+ "versionName" : "1.2.7",
+ "versionCode" : 127,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -60,14 +60,14 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
- "schemes" : ""
+ "schemes" : "dafanguan"
},
/* ios鎵撳寘閰嶇疆 */
"ios" : {
"idfa" : true,
"urltypes" : [
{
- "urlschemes" : [ "tbopen34348719" ] //tbopen+鎮ㄥ簲鐢ㄧ殑AppKey
+ "urlschemes" : [ "tbopen34348719", "dafanguan" ] //tbopen+鎮ㄥ簲鐢ㄧ殑AppKey
}
],
"urlschemewhitelist" : "tbopen,tmall,snssdk1128",
diff --git a/uniapp/pages/index/categories.vue b/uniapp/pages/index/categories.vue
index 41145a5..1af315d 100644
--- a/uniapp/pages/index/categories.vue
+++ b/uniapp/pages/index/categories.vue
@@ -130,10 +130,7 @@
this.getGoodsList();
})
},
-
-
godetails(info){
- console.log(1111);
uni.navigateTo({
url: '../goods/goodsDetail?info=' + encodeURIComponent(JSON.stringify(info))
})
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 5104307..0dcdf83 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -1,9 +1,11 @@
<template>
- <view v-if="isshowtype">
- <indexnewPage :Topheight="Topheight" :recomendType="recomendType" :canrefush='canrefush' :fixedClass='fixedClass'></indexnewPage>
+ <view v-if="isshowtype">
+ <indexnewPage :Topheight="Topheight" :recomendType="recomendType" :canrefush='canrefush'
+ :fixedClass='fixedClass'></indexnewPage>
</view>
<view v-else class="index-wrapper wrapperLayer borderBox">
- <view class="fixed-container colCen borderBox" :style="'background:'+ (categoryCurrent>0?'#EE1B14':(scrollTop>30?'#EE1B14;':bannerColor) +';')">
+ <view class="fixed-container colCen borderBox"
+ :style="'background:'+ (categoryCurrent>0?'#EE1B14':(scrollTop>30?'#EE1B14;':bannerColor) +';')">
<view class="topbarbox"></view>
<view class="headerSearch-container rowCenBet borderBox">
<view class="leftgoSearchbox rowCen borderBox" @click="goPath('search')">
@@ -24,10 +26,13 @@
</view>
<view class="categoryNavbar-container rowCenBet">
- <scroll-view class="categoryScroll" scroll-x scroll-with-animation @scroll="rowscroll" :scroll-into-view="nowcurrentid" :scroll-left="scrollleftnum">
+ <scroll-view class="categoryScroll" scroll-x scroll-with-animation @scroll="rowscroll"
+ :scroll-into-view="nowcurrentid" :scroll-left="scrollleftnum">
<block v-for="(items,index) in categoryList" :key='index'>
<view class="category-container">
- <view class="category-items colCenCen" @click="cateChange(index)" :id="categoryCurrent==index?'category-items-active':''" :class="categoryCurrent==index?'category-items-active':''">
+ <view class="category-items colCenCen" @click="cateChange(index)"
+ :id="categoryCurrent==index?'category-items-active':''"
+ :class="categoryCurrent==index?'category-items-active':''">
<view class="categoryname">
{{items.cname}}
</view>
@@ -68,15 +73,20 @@
</view>
<view class="body-container colCen borderBox">
- <swiper class="pageSwiper" :disable-touch='canswiper' duration="200" :current='categoryCurrent' @change='changeCatepage' @transition='swipering' @animationfinish='stopswiper'>
+ <swiper class="pageSwiper" :disable-touch='canswiper' duration="200" :current='categoryCurrent'
+ @change='changeCatepage' @transition='swipering' @animationfinish='stopswiper'>
<swiper-item v-for="(items,index) in categoryList" :key='index' :current-item-id='items.cid'>
<view v-if='index==0'>
- <indexPage ref='indexPage' :recomendType="recomendType" :canrefush='canrefush' :fixedClass='fixedClass' @scrolltoTop='scrolltoTop' @scrolltoview='scrolltoview'
- @pushfixed='getfixed' @scrollNum='getScroll' :Topheight='Topheight' @passColor='getColor'></indexPage>
+ <indexPage ref='indexPage' :recomendType="recomendType" :canrefush='canrefush'
+ :fixedClass='fixedClass' @scrolltoTop='scrolltoTop' @scrolltoview='scrolltoview'
+ @pushfixed='getfixed' @scrollNum='getScroll' :Topheight='Topheight' @passColor='getColor'>
+ </indexPage>
</view>
<view v-else>
- <categoryPage v-if="index==categoryCurrent+1 || index==categoryCurrent-1 || index==categoryCurrent" :parentId='items.cid'
- :Topheight='Topheight' :canrefush='canrefush' :canload='index==categoryCurrent'>
+ <categoryPage
+ v-if="index==categoryCurrent+1 || index==categoryCurrent-1 || index==categoryCurrent"
+ :parentId='items.cid' :Topheight='Topheight' :canrefush='canrefush'
+ :canload='index==categoryCurrent'>
</categoryPage>
</view>
</swiper-item>
@@ -84,14 +94,15 @@
</view>
<!-- 寮规骞垮憡 -->
<u-mask :show="showBulletFrame">
- <view class="warp">
- <!-- <view @tap.stop> -->
- <image class="pic" :src="BulletFrameData.image" mode="aspectFit" @tap.stop="goToShowBulletFrame(BulletFrameData)"/>
- <!-- </view> -->
- <view class="clone" @click="showBulletFrame = false">
- <image class="image" width="64rpx" height="64rpx" src="/static/images/app/close.png"></image>
- </view>
- </view>
+ <view class="warp">
+ <!-- <view @tap.stop> -->
+ <image class="pic" :src="BulletFrameData.image" mode="aspectFit"
+ @tap.stop="goToShowBulletFrame(BulletFrameData)" />
+ <!-- </view> -->
+ <view class="clone" @click="showBulletFrame = false">
+ <image class="image" width="64rpx" height="64rpx" src="/static/images/app/close.png"></image>
+ </view>
+ </view>
</u-mask>
</view>
</template>
@@ -109,9 +120,9 @@
},
data() {
return {
- BulletFrameData:{},
- showBulletFrame:false, // 鐢ㄤ簬鎺у埗寮规骞垮憡鐨勬樉绀�
- isNewMessage:false,
+ BulletFrameData: {},
+ showBulletFrame: false, // 鐢ㄤ簬鎺у埗寮规骞垮憡鐨勬樉绀�
+ isNewMessage: false,
shareShow: false,
bannerColor: '',
cateModel: false,
@@ -120,28 +131,27 @@
current: 1,
scrollTop: 0,
fixedClass: false,
- canrefush:true,
+ canrefush: true,
categoryList: [],
- canswiper:false,
- scrollleftnum:0,
- rowLeft:0,
- nowcurrentid:'',
- recomendType:1,
- isshowtype:false,
- hasshow:false
+ canswiper: false,
+ scrollleftnum: 0,
+ rowLeft: 0,
+ nowcurrentid: '',
+ recomendType: 1,
+ isshowtype: false,
+ hasshow: false
}
},
onLoad() {
this.getCategoryList();
- this.getPopBannerInfo();
-
+ this.getCusPopupInfo();
+ this.getArgument();
},
onShow() {
- if(!this.hasshow)
- {
+ if (!this.hasshow) {
this.shShow();
- }
- if(this.categoryList){
+ }
+ if (this.categoryList) {
this.getCategoryList();
}
this.getNewMessage();
@@ -154,31 +164,37 @@
},
watch: {},
methods: {
-
- shShow()
+ getArgument()
{
- var that=this;
- var istoLogin=true;
+ var arg=getApp().globalData.argumentStr;
+ if(arg&&arg.length>0)
+ {
+ getApp().targetArgument(arg);
+ getApp().globalData.argumentStr="";
+ }
+ },
+ shShow() {
+ var that = this;
+ var istoLogin = true;
this.$u.api.comminInt({}).then(e => {
- that.hasshow=true;
+ 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;
+ that.isshowtype = true;
+ istoLogin = false;
} else {
- that.isshowtype=false;
+ that.isshowtype = false;
}
}
- if(istoLogin)
- {
- if(!that.hasLogin){
+ if (istoLogin) {
+ if (!that.hasLogin) {
setTimeout(() => {
uni.reLaunch({
- url:"/pages/login/wxlogin"
+ url: "/pages/login/wxlogin"
})
}, 1000)
-
+
}
/* var user= uni.getStorageSync('userInfo');
if(!user.invitation_code)
@@ -192,15 +208,32 @@
return;
} */
}
-
+
// #endif
}).catch(function(err) {
console.log(err);
})
},
- goToShowBulletFrame(info){
- this.showBulletFrame = false
+ goToShowBulletFrame(info) {
+ this.showBulletFrame = false
utils.goUrl(info, this)
+ },
+
+ getCusPopupInfo() { //鑾峰彇鑷畾涔夊脊绐楁暟鎹�
+ var that = this;
+ this.$u.api.getCustomizePopup({}).then(e => {
+ if (e.code == 0) {
+ var res = e.data;
+ if (res.haspop) { //鏈夎嚜瀹氫箟寮圭獥
+ this.showBulletFrame = true;
+ this.BulletFrameData = res.info;
+ } else {
+ this.getPopBannerInfo();
+ }
+ }
+ }).catch(function(err) {
+ this.getPopBannerInfo();
+ })
},
getPopBannerInfo() {
// banner鏁版嵁
@@ -210,46 +243,46 @@
}).then(e => {
if (e.code == 1) return that.$alert(e.msg);
var res = e.data.info;
- if(res.length > 0){
+ if (res.length > 0) {
this.showBulletFrame = true;
this.BulletFrameData = res[0]
}
- }).catch(function(err) {
- })
+ }).catch(function(err) {})
},
- getNewMessage(){
+ getNewMessage() {
var that = this;
this.$u.api.getTopMessId({}).then(e => {
- if(e.code != 0)return that.$alert(e.msg)
- if(e.data.id){
+ if (e.code != 0) return that.$alert(e.msg)
+ if (e.data.id) {
let oldId = uni.getStorageSync('topMessageId');
- if(oldId != e.data.id)that.isNewMessage = true;
+ if (oldId != e.data.id) that.isNewMessage = true;
}
- }).catch(function (err) {
- })
+ }).catch(function(err) {})
},
- rowscroll(e){
+ rowscroll(e) {
this.rowLeft = e.scrollLeft
},
- currentscroll(left){
+ currentscroll(left) {
this.nowcurrentid = ''
this.scrollleftnum = this.rowLeft
- this.$nextTick(()=>{
+ this.$nextTick(() => {
this.nowcurrentid = 'category-items-active'
})
},
getCategoryList() {
var that = this;
- this.$u.api.getTopCalss({ctype:1,parentId:0}).then(e => {
- if(e.code != 0)return that.$alert(e.msg)
+ this.$u.api.getTopCalss({
+ ctype: 1,
+ parentId: 0
+ }).then(e => {
+ if (e.code != 0) return that.$alert(e.msg)
var obj = {}
obj.cname = '鎺ㄨ崘';
obj.cid = 0;
obj.ctype = 0;
that.categoryList = e.data.list;
that.categoryList.unshift(obj);
- }).catch(function (err) {
- })
+ }).catch(function(err) {})
},
// 椤甸潰鏍峰紡澶勭悊
@@ -283,12 +316,12 @@
this.$refs.indexPage[0].getNextPage()
}
},
-
- swipering(){
+
+ swipering() {
this.canrefush = false
},
-
- stopswiper(){
+
+ stopswiper() {
this.canrefush = true
},
// 璺敱璺宠浆
@@ -301,9 +334,7 @@
uni.navigateTo({
url: './officialNotice'
})
- }
- else if(url=='turnChain')
- {
+ } else if (url == 'turnChain') {
uni.navigateTo({
url: '../mine/tools/turnChain'
})
@@ -369,11 +400,11 @@
</script>
<style lang="scss">
- uni-image
- {
- width:30rem;
- height:25rem
+ uni-image {
+ width: 30rem;
+ height: 25rem
}
+
.index-wrapper {
height: 100vh;
overflow: hidden;
@@ -440,8 +471,9 @@
color: #FFFFFF;
}
}
- .searchImg{
- image{
+
+ .searchImg {
+ image {
width: 40rpx;
height: 40rpx;
font-size: 50rpx;
@@ -576,30 +608,33 @@
}
}
}
- .warp{
- position: relative;
- top:50%;
- left:50%;
- transform: translate(-50%, -50%);
- display:flex;
- align-items: center;
- justify-content: center;
+
+ .warp {
+ position: relative;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ display: flex;
+ align-items: center;
+ justify-content: center;
width: 100%;
- .pic{
- // width: 86.6%;
+
+ .pic {
+ // width: 86.6%;
// height: 100vw;
- }
+ }
}
-
+
.clone {
- position:absolute;
- bottom: -30rpx;
- transform: translate(calc(50% - 32rpx));
- .image {
- width: 64rpx;
- margin: 0 auto;
- height: 64rpx;
- display: block;
- }
+ position: absolute;
+ bottom: -30rpx;
+ transform: translate(calc(50% - 32rpx));
+
+ .image {
+ width: 64rpx;
+ margin: 0 auto;
+ height: 64rpx;
+ display: block;
+ }
}
-</style>
+</style>
\ No newline at end of file
diff --git a/uniapp/pages/mine/elm.vue b/uniapp/pages/mine/elm.vue
index 32811ef..5c09515 100644
--- a/uniapp/pages/mine/elm.vue
+++ b/uniapp/pages/mine/elm.vue
@@ -162,6 +162,7 @@
jumpMini() {
var isAppletJump = getApp().globalData.appinfo.isAppletJump;
if(isAppletJump){
+ console.log('isAppletJump')
var appId = this.pageInfo.app_id;
var appPath = this.pageInfo.wx_miniprogram_path;
plus.share.getServices(function(res) {
@@ -172,6 +173,7 @@
sweixin = t;
}
}
+ console.log(sweixin)
if (sweixin) {
sweixin.launchMiniProgram({
id: appId,
@@ -188,6 +190,7 @@
pname: 'com.taobao.taobao',
action: 'taobao://'
})) {
+ console.log('tb')
const plug = uni.requireNativePlugin('xiguazhu-baichuan')
plug.detailPage({
url: this.pageInfo.click_url,
@@ -196,6 +199,7 @@
// console.log(result);
});
} else {
+ console.log('webview')
uni.navigateTo({
url: '../webView/webView?url=' +this.pageInfo.click_url,
})
diff --git a/uniapp/pages/mine/inviteFriends.vue b/uniapp/pages/mine/inviteFriends.vue
index 1961a42..49104f8 100644
--- a/uniapp/pages/mine/inviteFriends.vue
+++ b/uniapp/pages/mine/inviteFriends.vue
@@ -31,7 +31,7 @@
<view class="step-list">
1. 灏嗛個璇风爜鎴栨捣鎶ュ垎浜粰濂藉弸</br>
鈷� 濂藉弸娉ㄥ唽鏃跺～鍐欐偍鐨勯個璇风爜</br>
- 3. 濂藉弸鍗冲彲0鍏冭喘涔版敼鍟嗗搧</br>
+ 3. 濂藉弸鍗冲彲0鍏冭喘涔拌鍟嗗搧</br>
鏈潵浠�/濂规湁璐墿璁㈠崟,鎮ㄥ彲鑾峰緱浣ｉ噾濂栧姳,骞惰嚜鍔ㄨ鍏ユ偍鐨勫笎鎴�
</view>
</view>
diff --git a/uniapp/utils/http.api.js b/uniapp/utils/http.api.js
index 083441c..2292cd2 100644
--- a/uniapp/utils/http.api.js
+++ b/uniapp/utils/http.api.js
@@ -103,7 +103,7 @@
let updateCidUrl="/api/user/UpdateClientId";
let checkPreferenceGoodsUrl="/api/user/check_preference_goods";
let gussessLikeGoodsUrl="/api/taoke/gussess_like_goods";
-
+let getCustomizePopupUrl="/api/activity/getCustomizePopup";
// 姝ゅ绗簩涓弬鏁皏m锛屽氨鏄垜浠湪椤甸潰浣跨敤鐨則his锛屼綘鍙互閫氳繃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
@@ -213,9 +213,10 @@
let updateCid=(params={})=>vm.$u.post(updateCidUrl,params);//鏇存柊pushcid
let checkPreferenceGoods=(params={})=>vm.$u.post(checkPreferenceGoodsUrl,params);//妫�娴嬫槸鍚︽湁鍋忓ソ鍟嗗搧
let gussessLikeGoods=(params={})=>vm.$u.post(gussessLikeGoodsUrl,params);//棣栭〉鐚滀綘鍠滄
+ let getCustomizePopup=(params={})=>vm.$u.post(getCustomizePopupUrl,params);//棣栭〉鑷畾涔夊脊绐�
// 灏嗗悇涓畾涔夌殑鎺ュ彛鍚嶇О锛岀粺涓�鏀捐繘瀵硅薄鎸傝浇鍒皏m.$u.api(鍥犱负vm灏辨槸this锛屼篃鍗硉his.$u.api)涓�
- vm.$u.api = {gussessLikeGoods,checkPreferenceGoods,updateCid,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};
+ vm.$u.api = {getCustomizePopup,gussessLikeGoods,checkPreferenceGoods,updateCid,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 {
--
Gitblit v1.9.3