'2024-2-1提交'
This commit is contained in:
parent
a4de0e97ef
commit
37324cb1f8
14
api/api.js
14
api/api.js
|
|
@ -360,12 +360,10 @@ export function getinstallment(data) {
|
|||
}
|
||||
|
||||
|
||||
// 首页记录ip
|
||||
export function logoip() {
|
||||
return request.get(`login/log`, {}, {
|
||||
noAuth: true
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 查询签约是否成功
|
||||
// export function getqytrue(data) {
|
||||
// return request.get('order/getSignResult/',data,{
|
||||
// noAuth: true
|
||||
// })
|
||||
// }
|
||||
|
|
@ -2,33 +2,32 @@
|
|||
// let domain = 'http://117.50.163.143:20410'
|
||||
// let domain = 'http://117.50.215.20:20410'
|
||||
// let domain = 'http://192.168.2.14:8081'
|
||||
let domain = 'http://106.75.49.247:20410'
|
||||
|
||||
// let domain = 'http://106.75.49.247:20410'
|
||||
let domain = 'https://yruibao.com/prod'
|
||||
module.exports = {
|
||||
// 请求域名 格式： https://您的域名
|
||||
// #ifdef MP || APP-PLUS
|
||||
// HTTP_REQUEST_URL:'',
|
||||
HTTP_REQUEST_URL: domain,
|
||||
// H5商城地址
|
||||
HTTP_H5_URL: 'http://106.75.49.247:20410',
|
||||
// HTTP_H5_URL: 'http://192.168.2.14:8081',
|
||||
// HTTP_H5_URL: 'http://117.50.215.20:20410',
|
||||
// HTTP_REQUEST_URL:'',
|
||||
HTTP_REQUEST_URL: domain,
|
||||
// H5商城地址
|
||||
HTTP_H5_URL: 'https://yruibao.com/prod', //正式
|
||||
// HTTP_H5_URL: 'http://192.168.2.14:8081', //本地
|
||||
// HTTP_H5_URL: 'http://117.50.215.20:20410', //测试
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
HTTP_REQUEST_URL:domain,
|
||||
HTTP_REQUEST_URL: domain,
|
||||
// #endif
|
||||
HEADER:{
|
||||
HEADER: {
|
||||
'content-type': 'application/json',
|
||||
|
||||
|
||||
},
|
||||
HEADERPARAMS:{
|
||||
HEADERPARAMS: {
|
||||
'content-type': 'application/x-www-form-urlencoded'
|
||||
},
|
||||
// 回话密钥名称 请勿修改此配置
|
||||
TOKENNAME: 'Authori-zation',
|
||||
// 缓存时间 0 永久
|
||||
EXPIRE:0,
|
||||
EXPIRE: 0,
|
||||
//分页最多显示条数
|
||||
LIMIT: 10
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
</view>
|
||||
<!-- menu -->
|
||||
<view class='nav acea-row' @click.native="bindEdit('indexMenu')">
|
||||
<block v-for="(item,index) in menus" :key="index">
|
||||
<block v-for="(item,index) in menus" :key="index" v-if="item.id != 1698">
|
||||
<view class='item' @click="menusTap(item.url)">
|
||||
<view class='pictrue'>
|
||||
<image :src='item.pic' class="skeleton-radius"></image>
|
||||
|
|
@ -176,7 +176,8 @@
|
|||
} from "@/api/user";
|
||||
// #ifdef MP-WEIXIN || APP-PLUS
|
||||
import {
|
||||
getTemlIds
|
||||
getTemlIds,
|
||||
logoip
|
||||
} from '@/api/api.js';
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
|
|
@ -434,6 +435,8 @@
|
|||
if (this.isLogin && parseInt(app.globalData.spread) > 0) {
|
||||
silenceBindingSpread()
|
||||
}
|
||||
|
||||
|
||||
|
||||
},
|
||||
onShow() {
|
||||
|
|
@ -449,8 +452,18 @@
|
|||
}, 1000)
|
||||
// #endif
|
||||
uni.showTabBar();
|
||||
|
||||
// 调用记录ip
|
||||
this.getip()
|
||||
},
|
||||
methods: {
|
||||
// 首页记录ip
|
||||
getip(){
|
||||
logoip().then(res => {
|
||||
console.log(res,'记录ip')
|
||||
})
|
||||
},
|
||||
|
||||
menusTap(url) {
|
||||
goPage().then(res => {
|
||||
if (url == '/pages/goods_cate/goods_cate') {
|
||||
|
|
@ -512,13 +525,13 @@
|
|||
callback(data[0]);
|
||||
});
|
||||
},
|
||||
xieyiApp() {
|
||||
xieyiApp(){
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
|
||||
})
|
||||
},
|
||||
// #ifdef APP-PLUS
|
||||
xieyiApp() {
|
||||
xieyiApp(){
|
||||
uni.navigateTo({
|
||||
animationType: animationType.type,
|
||||
animationDuration: animationType.duration,
|
||||
|
|
@ -526,26 +539,26 @@
|
|||
})
|
||||
},
|
||||
// 同意隐私协议
|
||||
confirmApp() {
|
||||
confirmApp(){
|
||||
uni.setStorageSync('privacyStatus', true)
|
||||
this.privacyStatus = false
|
||||
},
|
||||
// 关闭Model
|
||||
closeModel() {
|
||||
closeModel(){
|
||||
this.privacyStatus = false
|
||||
},
|
||||
// #endif
|
||||
// #ifdef MP || APP-PLUS
|
||||
getTemlIds() {
|
||||
for (var i in arrTemp) {
|
||||
getTemlIds(){
|
||||
for(var i in arrTemp){
|
||||
this.getTem(arrTemp[i]);
|
||||
}
|
||||
},
|
||||
getTem(data) {
|
||||
getTem(data){
|
||||
getTemlIds({
|
||||
type: data
|
||||
}).then(res => {
|
||||
if (res.data) {
|
||||
if (res.data){
|
||||
let arr = res.data.map((item) => {
|
||||
return item.tempId
|
||||
})
|
||||
|
|
@ -555,13 +568,13 @@
|
|||
},
|
||||
// #endif
|
||||
// 关闭优惠券弹窗
|
||||
onColse() {
|
||||
onColse(){
|
||||
this.$set(this, "window", false);
|
||||
},
|
||||
/**
|
||||
* 获取我的推荐
|
||||
*/
|
||||
get_host_product: function() {
|
||||
get_host_product: function(){
|
||||
let that = this;
|
||||
that.loading = true;
|
||||
|
||||
|
|
@ -577,7 +590,7 @@
|
|||
},
|
||||
|
||||
// 首页数据
|
||||
getIndexConfig: function() {
|
||||
getIndexConfig: function(){
|
||||
let that = this;
|
||||
//this.isNodes++;
|
||||
getIndexData().then(res => {
|
||||
|
|
@ -588,8 +601,8 @@
|
|||
that.$set(that, "imgUrls", res.data.banner);
|
||||
that.$set(that, "menus", res.data.menus);
|
||||
that.$set(that, "roll", res.data.roll ? res.data.roll : []);
|
||||
that.$set(that, 'cardShow', res.data.homePageSaleListStyle == '' ? 1 : Number(res.data
|
||||
.homePageSaleListStyle)); //首页商品列表模板获取配置
|
||||
that.$set(that, 'cardShow', res.data.homePageSaleListStyle == '' ? 1 : Number(res.data.homePageSaleListStyle)); //首页商品列表模板获取配置
|
||||
// console.log(this.menus,11)
|
||||
// 保存商品分类页配置
|
||||
that.$Cache.setItem({
|
||||
name: 'categoryConfig',
|
||||
|
|
@ -622,7 +635,7 @@
|
|||
|
||||
});
|
||||
},
|
||||
appVersionConfig() {
|
||||
appVersionConfig(){
|
||||
var that = this;
|
||||
//app升级
|
||||
// 获取本地应用资源版本号
|
||||
|
|
@ -658,7 +671,6 @@
|
|||
.iosAddress));
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<view class="num" v-if="userInfo && userInfo.phone && uid">
|
||||
<view class="num-txt">{{userInfo.phone}}</view>
|
||||
<view class="icon">
|
||||
<image src="/static/images/edit.png" mode=""></image>
|
||||
<image src="/static/images/edit.png" mode="" @click="goEdit()"></image>
|
||||
</view>
|
||||
<view class="real_name" @click="btnreal">
|
||||
{{realname}}
|
||||
|
|
@ -44,10 +44,10 @@
|
|||
<text class="num">{{userInfo.nowMoney && uid ? userInfo.nowMoney:0}}</text>
|
||||
<view class="txt">余额</view>
|
||||
</view>
|
||||
<view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
|
||||
<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
|
||||
<text class="num">{{userInfo.integral && uid ? userInfo.integral: 0}}</text>
|
||||
<view class="txt">积分</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
|
||||
<text class="num">{{userInfo.couponCount && uid ? userInfo.couponCount : 0}}</text>
|
||||
<view class="txt">优惠券</view>
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
<view class="menu-title">我的服务</view>
|
||||
<view class="list-box">
|
||||
<block v-for="(item,index) in MyMenus" :key="index"
|
||||
v-if="item.id == 1622 || item.id == 1625|| item.id == 1626 || item.id == 1627|| item.id == 1628|| item.id == 1630|| item.id == 1631|| item.id == 1632|| item.id == 1634">
|
||||
v-if="item.id != 1751 && item.id != 1754 && item.id !=1752 &&item.id !=1744">
|
||||
<view class="item" @click="menusTap(item.url)"
|
||||
v-if="!(item.url =='/pages/service/index' || (item.url =='/pages/users/user_spread_user/index' && !userInfo.isPromoter))">
|
||||
<image :src="item.pic"></image>
|
||||
|
|
@ -180,6 +180,7 @@
|
|||
} from '@/utils/setTheme.js'
|
||||
import animationType from '@/utils/animationType.js'
|
||||
const app = getApp();
|
||||
|
||||
export default {
|
||||
computed: mapGetters(['isLogin', 'chatUrl', 'uid']),
|
||||
data() {
|
||||
|
|
@ -273,6 +274,7 @@
|
|||
that.$set(that, 'pageHeight', app.globalData.windowHeight);
|
||||
// #endif
|
||||
that.$set(that, 'MyMenus', app.globalData.MyMenus);
|
||||
|
||||
that.$set(that, 'chatConfig', Cache.getItem('chatConfig'));
|
||||
// #ifdef H5
|
||||
that.shareApi();
|
||||
|
|
@ -323,6 +325,7 @@
|
|||
uid: this.$store.getters.uid
|
||||
}
|
||||
getidentity(data).then(res=>{
|
||||
// console.log(res.data)
|
||||
if (res.message == '操作成功') {
|
||||
this.realname = '已实名'
|
||||
this.identification = res.data
|
||||
|
|
@ -336,7 +339,7 @@
|
|||
})
|
||||
},
|
||||
//校验token是否有效,true为有效，false为无效
|
||||
getTokenIsExist() {
|
||||
getTokenIsExist(){
|
||||
tokenIsExistApi().then(res => {
|
||||
let tokenIsExist = res.data;
|
||||
if (this.isLogin && tokenIsExist) {
|
||||
|
|
@ -353,7 +356,7 @@
|
|||
})
|
||||
},
|
||||
//获取授权图片
|
||||
copyrightImage() {
|
||||
copyrightImage(){
|
||||
copyrightApi().then(res => {
|
||||
if (res.data) {
|
||||
this.copyImage = res.data.companyImage;
|
||||
|
|
@ -481,13 +484,13 @@
|
|||
// if (this.MyMenus.length) return;
|
||||
getMenuList().then(res => {
|
||||
that.$set(that, 'MyMenus', res.data.routine_my_menus);
|
||||
console.log(this.MyMenus,11)
|
||||
that.wechatUrl = res.data.routine_my_menus.filter((item) => {
|
||||
return item.url.indexOf('service') !== -1
|
||||
})
|
||||
res.data.routine_my_menus.map((item) => {
|
||||
if (item.url.indexOf('service') !== -1) that.servicePic = item.pic
|
||||
})
|
||||
// that.imgUrls = res.data.routine_my_banner
|
||||
if (res.data.routine_my_banner) {
|
||||
that.imgUrls = res.data.routine_my_banner
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<view class="">
|
||||
<web-view :src="https" @message="handleGetMessage"></web-view>
|
||||
<web-view ref="webview" :src="https" @message="handleGetMessage"></web-view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -14,17 +14,16 @@
|
|||
onShow() {
|
||||
|
||||
},
|
||||
onLoad(option) {
|
||||
|
||||
this.https = decodeURIComponent(option.https)
|
||||
// console.log(option.http)
|
||||
onLoad() {
|
||||
this.https = this.$Cache.get('https')
|
||||
// this.https = decodeURIComponent(option)
|
||||
console.log(this.https,111)
|
||||
},
|
||||
methods: {
|
||||
|
||||
handleGetMessage:function(e){
|
||||
console.log(e)
|
||||
if(e.detail.data[0].result == 'success'){
|
||||
uni.navigateTo({
|
||||
uni.redirectTo({
|
||||
url:'/pages/users/signin/index'
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class='item acea-row row-between-wrapper'
|
||||
<!-- <view class='item acea-row row-between-wrapper'
|
||||
v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
|
||||
<view>积分抵扣</view>
|
||||
<view class='discount acea-row row-middle'>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
:disabled="orderInfoVo.userIntegral==0 && !useIntegral" @click="btnjf" />
|
||||
</checkbox-group>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <view class='item acea-row row-between-wrapper'
|
||||
v-if="priceGroup.vipPrice > 0 && userInfo.vip && !pinkId && !BargainId && !combinationId && !seckillId">
|
||||
<view>会员优惠</view>
|
||||
|
|
@ -402,18 +402,16 @@
|
|||
downPaymentAmount: 0,
|
||||
totalAmount: 0,
|
||||
identification:{}, //获取是否存有身份信息
|
||||
zongmey:'',
|
||||
|
||||
|
||||
zongmey:''
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
computed:{
|
||||
...mapGetters(['isLogin', 'systemPlatform', 'productType']),
|
||||
markNum() {
|
||||
let markNum = 0;
|
||||
if (this.mark) {
|
||||
markNum = 150 - this.mark.length
|
||||
return markNum
|
||||
return markNum
|
||||
}
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -157,6 +157,8 @@
|
|||
import {
|
||||
getInformation
|
||||
} from '@/api/api.js'
|
||||
// import config from '@/config/app.js'
|
||||
// const baseUrl = config.domain
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -201,11 +203,14 @@
|
|||
// 进来判断是否有无保存过身份信息
|
||||
if (JSON.parse(option.identification)) {
|
||||
this.identification = JSON.parse(option.identification)
|
||||
console.log(this.identification)
|
||||
this.realName = this.identification.realName
|
||||
this.idcard = this.identification.idCardNumber
|
||||
this.tel = this.identification.commonPhoneNumber
|
||||
this.upLoadReverseImg = this.identification.idCardBackPhoto.slice(21)
|
||||
this.upLoadPositiveImg = this.identification.idCardFrontPhoto.slice(21)
|
||||
// this.upLoadReverseImg = this.identification.idCardBackPhoto.slice(21)
|
||||
// this.upLoadPositiveImg = this.identification.idCardFrontPhoto.slice(21)
|
||||
this.upLoadReverseImg = this.identification.idCardBackPhoto
|
||||
this.upLoadPositiveImg = this.identification.idCardFrontPhoto
|
||||
this.emitext = this.identification.email
|
||||
// this.telthre = this.identification.phoneNumber
|
||||
this.lxindex = this.identification.userEmergencyContactsList[0].relationship
|
||||
|
|
@ -239,8 +244,7 @@
|
|||
this.lxrmoren = '同事'
|
||||
this.lxrmorens = '同事'
|
||||
}
|
||||
console.log(this.upLoadPositiveImg)
|
||||
console.log(this.upLoadReverseImg)
|
||||
// console.log('https://yruibao.com' + this.upLoadPositiveImg)
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@
|
|||
orderDel,
|
||||
getnowqy
|
||||
} from '@/api/order.js';
|
||||
|
||||
import {
|
||||
openOrderSubscribe
|
||||
} from '@/utils/SubscribeMessage.js';
|
||||
|
|
@ -225,10 +226,10 @@
|
|||
getnowqy(id).then(res => {
|
||||
this.logoflag = false //logo隐藏
|
||||
this.https = res.data.url
|
||||
|
||||
console.log(res.data.url,2222)
|
||||
this.$Cache.set('https',this.https)
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/inbound/index?http=' + this.https
|
||||
// url:'/pages/users/signin/index?=order45030170584172294634602'
|
||||
url: '/pages/users/inbound/index'
|
||||
})
|
||||
// #ifdef H5
|
||||
window.location.href=this.https
|
||||
|
|
@ -258,7 +259,7 @@
|
|||
},
|
||||
/**
|
||||
* 关闭支付组件
|
||||
*
|
||||
*
|
||||
*/
|
||||
payClose: function() {
|
||||
this.pay_close = false;
|
||||
|
|
@ -392,13 +393,14 @@
|
|||
* 切换类型
|
||||
*/
|
||||
statusClick: function(status) {
|
||||
// console.log(status);
|
||||
if (status == this.orderStatus) return;
|
||||
this.orderStatus = status;
|
||||
this.loadend = false;
|
||||
this.page = 1;
|
||||
this.$set(this, 'orderList', []);
|
||||
this.getOrderList();
|
||||
// 重新获取状态数量
|
||||
this.getOrderData();
|
||||
},
|
||||
/**
|
||||
* 获取订单列表
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
<navigator url="../../../pages/index/index" open-type="switchTab" class="fhsy">返回首页</navigator>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<!-- 加载logo -->
|
||||
<view class="logobox" v-show="logoflag">
|
||||
<image class="logoicon" src="../../../static/img/logo.png"></image>
|
||||
<image class="logoicon" src="../../../static/img/logo.png"></image>
|
||||
<text>正在签约中，请稍等...</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -48,23 +48,28 @@
|
|||
signStatus: '', //签约状态
|
||||
flag: false,
|
||||
text: '失败',
|
||||
logoflag:true,
|
||||
logoflag: true,
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
this.id = this.$Cache.get('qyids')
|
||||
this.orderNo = option.orderId
|
||||
this.orderNo = this.$Cache.get('qyids')
|
||||
// console.log(this.id)
|
||||
// this.orderNo = option.orderId
|
||||
// this.shopobj = JSON.parse(option.shopobj)
|
||||
this.getnews(this.orderNo)
|
||||
this.logoflag = true
|
||||
|
||||
this.timer = setInterval(() => {
|
||||
this.getnews()
|
||||
}, 1000);
|
||||
},
|
||||
onShow() {
|
||||
this.getnews(this.orderNo)
|
||||
this.logoflag = true
|
||||
|
||||
},
|
||||
methods: {
|
||||
getnews(id) {
|
||||
getqianyue(id).then(res => {
|
||||
getnews(orderNo) {
|
||||
getqianyue(orderNo).then(res => {
|
||||
console.log(res)
|
||||
this.signStatus = res.data.signStatus
|
||||
if (this.signStatus == 2) {
|
||||
this.flag = true
|
||||
|
|
@ -75,8 +80,11 @@
|
|||
},
|
||||
},
|
||||
onReady() {
|
||||
// 定时器
|
||||
|
||||
},
|
||||
onUnload() {
|
||||
// 在页面卸载时清除定时器
|
||||
clearInterval(this.timer);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -85,7 +93,7 @@
|
|||
page {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
||||
.logobox {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
|
|
@ -96,11 +104,12 @@
|
|||
opacity: 1;
|
||||
padding-top: 30%;
|
||||
box-sizing: border-box;
|
||||
background-color:#000;
|
||||
background-color: #000;
|
||||
text-align: center;
|
||||
z-index: 1;
|
||||
}
|
||||
.logobox text{
|
||||
|
||||
.logobox text {
|
||||
display: block;
|
||||
color: #fff;
|
||||
font-size: 14px;
|
||||
|
|
@ -110,6 +119,7 @@
|
|||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
|
||||
.logoicon {
|
||||
width: 80rpx;
|
||||
height: 140rpx;
|
||||
|
|
@ -119,6 +129,7 @@
|
|||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
|
||||
.Pay_success {
|
||||
width: 100%;
|
||||
margin-top: 200rpx;
|
||||
|
|
|
|||
|
|
@ -42,15 +42,15 @@
|
|||
</view>
|
||||
<view>充值记录</view>
|
||||
</navigator>
|
||||
<navigator class='item' hover-class='none' url='/pages/users/user_integral/index'>
|
||||
<!-- <navigator class='item' hover-class='none' url='/pages/users/user_integral/index'>
|
||||
<view class='pictrue'>
|
||||
<text class="iconfont icon-jifenzhongxin icon_txt"></text>
|
||||
</view>
|
||||
<view>积分中心</view>
|
||||
</navigator>
|
||||
</navigator> -->
|
||||
</view>
|
||||
<view class='advert acea-row row-between-wrapper'>
|
||||
<navigator class='item acea-row row-between-wrapper' hover-class='none' url='/pages/users/user_sgin/index'>
|
||||
<!-- <navigator class='item acea-row row-between-wrapper' hover-class='none' url='/pages/users/user_sgin/index'>
|
||||
<view class='text'>
|
||||
<view class='name'>签到领积分</view>
|
||||
<view>赚积分抵现金</view>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<view class='pictrue'>
|
||||
<image src='../../../static/images/gift.png'></image>
|
||||
</view>
|
||||
</navigator>
|
||||
</navigator> -->
|
||||
<navigator class='item on acea-row row-between-wrapper' hover-class='none' url='/pages/users/user_get_coupon/index'>
|
||||
<view class='text'>
|
||||
<view class='name'>领取优惠券</view>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user