杨世雄 / chemai2 · 提交

转到一个项目

作者 刘朕
提交 c5c4a4611f5d3e3b9b5cc50fd575ffdb3a45b28e 1 个父辈 4f68ce3b

更新

内嵌 并排对比
正在显示 96 个修改的文件 包含 284 行增加 和 184 行删除
... ... @@ -228,9 +228,9 @@ App({
globalData: {
userInfo: null,
baseUrl: 'https://car.goorcar.com/',
baseUrl: 'https://xiaoxiangauto.com/',
// baseUrl: 'http://chemai.t.brotop.cn/',
imagesUrl: 'https://car.goorcar.com/',
imagesUrl: 'https://xiaoxiangauto.com/',
statusHeight: 0,
stores_id: '', //进入4s店id
city_glob_id: '', // 城市定位
... ...
... ... @@ -188,7 +188,7 @@
"sitemapLocation": "sitemap.json",
"permission": {
"scope.userLocation": {
"desc": "小象车孚小程序请求获取您的位置信息"
"desc": "同放汽车小程序请求获取您的位置信息"
}
}
}
\ No newline at end of file
... ...
... ... @@ -61,7 +61,7 @@
.btn {
width: 82%;
height: 68rpx;
background-image: url(https://car.goorcar.com/assets/draw3/zixun_btn.png);
background-image: url(https://xiaoxiangauto.com/assets/draw3/zixun_btn.png);
background-repeat: no-repeat;
background-size: contain;
font-size: 24rpx;
... ...
... ... @@ -55,7 +55,7 @@
.getPrize .p-inner .form .btn {
width: 82%;
height: 68rpx;
background-image: url(https://car.goorcar.com/assets/draw3/zixun_btn.png);
background-image: url(https://xiaoxiangauto.com/assets/draw3/zixun_btn.png);
background-repeat: no-repeat;
background-size: contain;
font-size: 24rpx;
... ...
... ... @@ -14,7 +14,7 @@
.draw_alert {
width: 500rpx;
height: 700rpx;
background-image: url(https://car.goorcar.com/assets/draw3/zu10458@2x.png);
background-image: url(https://xiaoxiangauto.com/assets/draw3/zu10458@2x.png);
background-size: contain;
margin: 0 auto;
position: fixed;
... ... @@ -32,7 +32,7 @@
}
.checkgift {
background-image: url(https://car.goorcar.com/assets/draw3/zixun_btn@2x.png);
background-image: url(https://xiaoxiangauto.com/assets/draw3/zixun_btn@2x.png);
height: 53rpx;
line-height: 53rpx;
text-align: center;
... ...
... ... @@ -13,7 +13,7 @@
.draw_alert_box .draw_alert {
width: 500rpx;
height: 700rpx;
background-image: url(https://car.goorcar.com/assets/draw3/diyongquan_img@2x.png);
background-image: url(https://xiaoxiangauto.com/assets/draw3/diyongquan_img@2x.png);
background-size: contain;
margin: 0 auto;
position: fixed;
... ...
... ... @@ -38,6 +38,7 @@ Page({
user_id: 0, //顾问id
chou: {}, //抽奖结果
chouGui: {}, //抽奖活动规则
chouGuiContent: '', // 规则内容
chouLog: [], //获奖名单
indexData: {},
show: false, //展示页面
... ... @@ -508,11 +509,13 @@ Page({
if (type == 0) {
this.setData({
titleName: '关于同放',
chouGuiContent: this.data.chouGui.data.about,
showActRule: true
})
} else if (type == 1) {
this.setData({
titleName: '活动规则',
chouGuiContent: this.data.chouGui.data.gui,
showActRule: true
})
} else if (type == 2) {
... ...
... ... @@ -96,7 +96,7 @@
margin: auto;
.itemBg {
background: url(https://car.goorcar.com/assets/static/img/Rectangle2622@2x.png) no-repeat;
background: url(https://xiaoxiangauto.com/assets/static/img/Rectangle2622@2x.png) no-repeat;
background-size: 100%;
height: 130rpx;
width: 140rpx;
... ...
... ... @@ -190,7 +190,7 @@
{{titleName}}
</view>
<scroll-view scroll-y class="content">
<rich-text class="dialog-content" nodes="{{chouGui.data.gui}}" style="width: 100%;"></rich-text>
<rich-text class="dialog-content" nodes="{{chouGuiContent}}" style="width: 100%;"></rich-text>
<!-- <parse :content="chouGui.gui" :imageProp="{'domain':'www.mall.com'}"></parse> -->
</scroll-view>
<view class="bottomBtn" bindtap="clickCloseRule">
... ...
... ... @@ -98,7 +98,7 @@
}
.box .inner .draw .container-in .itemBg {
/* background: url(https://car.goorcar.com/assets/static/img/Rectangle2622@2x.png) no-repeat; */
/* background: url(https://xiaoxiangauto.com/assets/static/img/Rectangle2622@2x.png) no-repeat; */
background-color: rgb(36, 114, 226);
background-size: 100%;
height: 130rpx;
... ...
... ... @@ -39,10 +39,10 @@ Page({
name:'快递配送',
id:1
},
{
name:'自提',
id:2
},
// {
// name:'自提',
// id:2
// },
],
pei_type:1
},
... ... @@ -138,7 +138,7 @@ Page({
list_id: that.data.list_id,
pei_type:that.data.pei_type
}
if (obj.address_id) {
if (obj.pei_type == 2 || obj.address_id) { //自提或已选择收货地址
if (that.data.all_pay != 0) {
request({
url: 'api/gou/buy2',
... ... @@ -280,7 +280,7 @@ Page({
that.popTest()
}
},
changeChe() { //小象积分
changeChe() { //同放积分
if (this.data.img1) {
this.setData({
img1: false,
... ...
... ... @@ -57,7 +57,7 @@
<text class="remarks_ public_1">备注</text>
<text class="service_right public_2" bindtap="clickme">{{bei}}</text>
</view>
<!-- 小象积分 -->
<!-- 同放积分 -->
<view class=" integrate public " wx:if="{{no==''}}">
<text class="integrate_che public_1">同放积分（{{orderContent.ping_fen}}）</text>
<view class="red_imgs">
... ...
... ... @@ -190,7 +190,7 @@ Page({
}
},
changeChe() { //小象积分
changeChe() { //同放积分
if (this.data.img) {
this.setData({
img: false,
... ...
... ... @@ -61,9 +61,9 @@
<text class="remarks_ public_1">备注</text>
<text class="service_right public_2" bindtap="clickme">{{bei}}</text>
</view>
<!-- 小象积分 -->
<!-- 同放积分 -->
<view class=" integrate public ">
<text class="integrate_che public_1">小象积分（{{orderContent.ping_fen}}）</text>
<text class="integrate_che public_1">同放积分（{{orderContent.ping_fen}}）</text>
<view class="red_imgs">
<text class="integrate_right public_2">{{orderContent.ping_money}}</text>
<view class="changeIMg" catchtap="changeChe">
... ... @@ -114,7 +114,7 @@
</view>
<!-- 说明 explain -->
<view class="explain">
<text class="explain_ ">使用小象积分抵扣不享受积分赠送</text>
<text class="explain_ ">使用同放积分抵扣不享受积分赠送</text>
<view class="r_explain">
<text class="explain__right ">领取</text>
<text class="explain__red ">{{orderContent.fen}}</text>
... ...
... ... @@ -225,7 +225,7 @@ Page({
}
},
changeChe() { //小象积分
changeChe() { //同放积分
if (this.data.img) {
this.setData({
img: false,
... ...
... ... @@ -70,9 +70,9 @@
<text class="remarks_ public_1">备注</text>
<text class="service_right public_2" bindtap="clickme">{{bei}}</text>
</view>
<!-- 小象积分 -->
<!-- 同放积分 -->
<view class=" integrate public ">
<text class="integrate_che public_1">小象积分（{{orderContent.ping_fen}}）</text>
<text class="integrate_che public_1">同放积分（{{orderContent.ping_fen}}）</text>
<view class="red_imgs">
<text class="integrate_right public_2">{{orderContent.ping_money}}</text>
<view class="changeIMg" catchtap="changeChe">
... ... @@ -123,7 +123,7 @@
</view>
<!-- 说明 explain -->
<view class="explain">
<text class="explain_ ">使用小象积分抵扣不享受积分赠送</text>
<text class="explain_ ">使用同放积分抵扣不享受积分赠送</text>
<view class="r_explain">
<text class="explain__right ">领取</text>
<text class="explain__red ">{{orderContent.fen}}</text>
... ...
... ... @@ -122,6 +122,7 @@ Page({
it_cloose: false,
s4_id: data.id
})
wx.setStorageSync('s4_id', data.id)
that.getgood3List()
} else {
that.setData({
... ... @@ -454,7 +455,7 @@ Page({
onShareAppMessage(options) {
var that = this;
var shareObj = {
title: that.data.decorations.name || "小象分享", // 默认是小程序的名称(可以写slogan等)
title: that.data.decorations.name || "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/4Sstore/4Sstore', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
... ...
... ... @@ -37,7 +37,7 @@ page {
.btd {
width: 100%;
height: 380rpx;
background: url('https://car.goorcar.com/assets/static/img/v-q.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/v-q.png') no-repeat;
background-size: 100% 100%;
padding: 0 32rpx;
box-sizing: border-box;
... ...
... ... @@ -25,7 +25,7 @@
</view>
<view class="tit_item">
<image src="../../static/img/1_icon.png" />
<view class="item_names">服务担保</view>
<view class="item_names">服务承诺</view>
</view>
</view>
</view>
... ... @@ -82,7 +82,7 @@
</view>
<view class="scroll_2 catePublic" bindtap="goReservation">
<image src="{{imagesUrl}}assets/static/img/ress_e.png" class="publicImg" />
<view class="cate_1 cate_public">爱车维保</view>
<view class="cate_1 cate_public">维修保养</view>
</view>
<view class="scroll_3 catePublic" bindtap="goAccessories">
<image src="{{imagesUrl}}assets/static/img/ress_f.png" class="publicImg" />
... ...
... ... @@ -30,7 +30,7 @@ page {
.container .health .btd {
width: 100%;
height: 380rpx;
background: url('https://car.goorcar.com/assets/static/img/v-q.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/v-q.png') no-repeat;
background-size: 100% 100%;
padding: 0 32rpx;
box-sizing: border-box;
... ...
... ... @@ -3,5 +3,5 @@
"van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index"
},
"navigationBarTitleText": "小象订单"
"navigationBarTitleText": "同放订单"
}
\ No newline at end of file
... ...
... ... @@ -17,6 +17,7 @@
<view class="title_status" wx:if="{{item.way2 == 7}}">已完成</view>
<view class="title_status" wx:if="{{item.way2 == 8}}">退款中</view>
<view class="title_status" wx:if="{{item.way2 == 9}}">已退款</view>
<view class="title_status" wx:if="{{item.way2 == 10}}">拒绝退款</view>
</view>
<view class="service_content" wx:for="{{item.good}}" wx:key="id" wx:for-item="item1">
<view class="ser_img">
... ... @@ -41,7 +42,7 @@
立即支付
</button>
</view>
<view class="btns" wx:if="{{item.way2 == 3}}">
<view class="btns" wx:if="{{item.way2 == 3 || item.way2 == 10}}">
<button class="btn btn_3" catchtap="returnMoney" data-order_no="{{item.order_no}}">
申请退款
</button>
... ...
... ... @@ -256,7 +256,7 @@ Page({
onShareAppMessage(options) {
var that = this;
var shareObj = {
title: "小象分享", // 默认是小程序的名称(可以写slogan等)
title: "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/RecommendCar/RecommendCar', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
... ...
... ... @@ -23,7 +23,7 @@ Page({
click_num: '',
more: true,
S4Spage: false,
contenttext: '该经销商尚未授权小象平台的第三方担保服务',
contenttext: '该经销商尚未授权同放平台的第三方担保服务',
s4_id: ''
},
onShow: function () {
... ... @@ -298,7 +298,7 @@ Page({
// console.log(that.data.user_id)
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象分享", // 默认是小程序的名称(可以写slogan等)
title: "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/4Sstore/4Sstore', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
success: function (res) {
... ...
... ... @@ -188,7 +188,7 @@ Page({
onShareAppMessage(options) {
var that = this;
var shareObj = {
title: "小象分享团购热卖", // 默认是小程序的名称(可以写slogan等)
title: "同放分享团购热卖", // 默认是小程序的名称(可以写slogan等)
path: '/pages/VSpikeMallDetail/VSpikeMallDetail?id=' + that.data.id, // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
... ...
... ... @@ -54,7 +54,7 @@
<view class="collar">
至少领
<text class="count_num">{{detailsContent.fen}}</text>
小象积分
同放积分
</view>
<text class="all_clear collar">运费:{{detailsContent.yun}}</text>
</view>
... ... @@ -91,7 +91,7 @@
<image src="../../static/img/bao.png" />
</view>
</view>
<text class="pub">小象直营</text>
<text class="pub">同放直营</text>
<text class="pub">商品优选</text>
<text class="pub">破损包退</text>
<text class="pub">极速赔付</text>
... ...
... ... @@ -71,7 +71,7 @@ Page({
// console.log(that.data.user_id)
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象分享", // 默认是小程序的名称(可以写slogan等)
title: "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/VehicleList/VehicleList', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
success: function (res) {
... ...
... ... @@ -27,7 +27,7 @@
<view class="text_bx">
<view class="ster_nams title_content2">欧舒丹甜蜜樱花沐浴啫喱/身体乳套装</view>
<view class="cen_tite">
<view class="lis_title">小象直营</view>
<view class="lis_title">同放直营</view>
<view class="stay">
<view class="numbe">256</view>
<view class="ber_name">位车友推荐</view>
... ... @@ -49,7 +49,7 @@
<view class="text_bx">
<view class="ster_nams title_content2">欧舒丹甜蜜樱花沐浴啫喱/身体乳套装</view>
<view class="cen_tite">
<view class="lis_title">小象直营</view>
<view class="lis_title">同放直营</view>
<view class="stay">
<view class="numbe">256</view>
<view class="ber_name">位车友推荐</view>
... ... @@ -71,7 +71,7 @@
<view class="text_bx">
<view class="ster_nams title_content2">欧舒丹甜蜜樱花沐浴啫喱/身体乳套装</view>
<view class="cen_tite">
<view class="lis_title">小象直营</view>
<view class="lis_title">同放直营</view>
<view class="stay">
<view class="numbe">256</view>
<view class="ber_name">位车友推荐</view>
... ...
... ... @@ -3,7 +3,7 @@
<view class="s" style='height:{{statusTop}}px'></view>
<view class="left_img">
<image src="{{imagesUrl}}assets/static/img/img_z.png" bindtap="goback" />
<view class="title_oage">小象车孚</view>
<view class="title_oage">同放汽车</view>
</view>
</view>
<view class="health">
... ... @@ -70,7 +70,7 @@
<view class="imgzU" wx:for="{{four}}" wx:key="index1" wx:for-index="index1" wx:for-item="item1">
<!-- <image catchtap="previewImg" data-index="{{index}}" data-list="{{item.comment_images}}" data-index1="{{index1}}" src="{{item1}}" /> -->
<image src="{{imagesUrl}}assets/static/img/timg56.jpg" />
<view class="v_post">小象直营</view>
<view class="v_post">同放直营</view>
<view class="text_dian">
<view class="text_pt">
<view class="pt_name">点赞价</view>
... ... @@ -97,7 +97,7 @@
<view class="text_bx">
<view class="ster_nams title_content2">欧舒丹甜蜜樱花沐浴啫喱/身体乳套装</view>
<view class="cen_tite">
<view class="lis_title">小象直营</view>
<view class="lis_title">同放直营</view>
<view class="stay">
<view class="numbe">256</view>
<view class="ber_name">位车友推荐</view>
... ... @@ -119,7 +119,7 @@
<view class="text_bx">
<view class="ster_nams title_content2">欧舒丹甜蜜樱花沐浴啫喱/身体乳套装</view>
<view class="cen_tite">
<view class="lis_title">小象直营</view>
<view class="lis_title">同放直营</view>
<view class="stay">
<view class="numbe">256</view>
<view class="ber_name">位车友推荐</view>
... ... @@ -141,7 +141,7 @@
<view class="text_bx">
<view class="ster_nams title_content2">欧舒丹甜蜜樱花沐浴啫喱/身体乳套装</view>
<view class="cen_tite">
<view class="lis_title">小象直营</view>
<view class="lis_title">同放直营</view>
<view class="stay">
<view class="numbe">256</view>
<view class="ber_name">位车友推荐</view>
... ...
... ... @@ -430,7 +430,7 @@ Page({
// console.log(that.data.user_id)
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象分享", // 默认是小程序的名称(可以写slogan等)
title: "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/Vintegral/Vintegral', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
success: function (res) {
... ...
... ... @@ -3,7 +3,7 @@
"usingComponents": {
"searchInput": "../../components/searchInput/searchInput"
},
"navigationBarTitleText": "小象车孚",
"navigationBarTitleText": "同放汽车",
"navigationBarBackgroundColor": "#F53526",
"navigationBarTextStyle": "white",
"navigationStyle": "custom"
... ...
<view class="container">
<view class="tabbar">
<view class="tab_name">小象车孚</view>
<view class="tab_name">同放汽车</view>
<view class="search">
<searchInput></searchInput>
</view>
... ...
... ... @@ -65,7 +65,7 @@ Page({
onShareAppMessage(options) {
var that = this;
var shareObj = {
title: that.data.decorations.name || "小象分享", // 默认是小程序的名称(可以写slogan等)
title: that.data.decorations.name || "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/Vnew4Sstore/Vnew4Sstore?s4_id=' + that.data.s4_id + '&is_share=9', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
... ...
... ... @@ -38,7 +38,7 @@ page {
.btd {
width: 100%;
height: 380rpx;
background: url('https://car.goorcar.com/assets/static/img/v-q.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/v-q.png') no-repeat;
background-size: 100% 100%;
padding: 0 32rpx;
box-sizing: border-box;
... ...
... ... @@ -2,7 +2,7 @@
<view class="header">
<view class="s" style='height:{{statusTop}}px'></view>
<view class="left_img">
<view class="title_oage">小象车孚</view>
<view class="title_oage">同放汽车</view>
</view>
</view>
<view class="health" wx:if="{{S4Spage}}">
... ...
... ... @@ -32,7 +32,7 @@ page {
.container .health .btd {
width: 100%;
height: 380rpx;
background: url('https://car.goorcar.com/assets/static/img/v-q.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/v-q.png') no-repeat;
background-size: 100% 100%;
padding: 0 32rpx;
box-sizing: border-box;
... ...
... ... @@ -20,7 +20,7 @@ Page({
bind4S: 0,
pin_id: '',
cnt: [], //底部活动
car_login: 'https://car.goorcar.com/assets/static/img/che_img@2x.png',
car_login: 'https://xiaoxiangauto.com/assets/static/img/che_img@2x.png',
msg: '',
DWcity: '',
shortnameCity: '',
... ... @@ -417,7 +417,7 @@ Page({
// console.log(that.data.user_id)
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象分享", // 默认是小程序的名称(可以写slogan等)
title: "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/home/home', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
success: function (res) {
... ...
{
"usingComponents": {},
"navigationBarTitleText": "小象-汽车4S店开放平台"
"navigationBarTitleText": "同放-汽车4S店开放平台"
}
\ No newline at end of file
... ...
... ... @@ -304,7 +304,7 @@
</view>
<view class="lookmore">
<view class="look_btn" bindtap="lookMoreTap">查看更多</view>
<view class="lianjie">小象，赢得更多满意用户</view>
<view class="lianjie">同放，赢得更多满意用户</view>
</view>
</view>
<view class="sharebox">
... ...
... ... @@ -430,7 +430,7 @@ Page({
that.popTest()
}
},
changeChe() { //小象积分
changeChe() { //同放积分
if (this.data.img1) {
this.setData({
img1: false,
... ...
... ... @@ -101,11 +101,11 @@
</view>
<!-- 说明 explain
<view class="explain">
<text class="explain_ ">使用小象积分抵扣不享受积分赠送</text>
<text class="explain_ ">使用同放积分抵扣不享受积分赠送</text>
<view class="r_explain">
<text class="explain__right ">领取</text>
<text class="explain__red ">{{orderContent.fen}}</text>
<text class="explain__right ">小象积分</text>
<text class="explain__right ">同放积分</text>
</view>
</view> -->
</view>
... ... @@ -185,7 +185,7 @@
</view>
<button class="btn" bindtap="send4sClerk">下一步</button>
</block>
<text class="remarks">小象汽车互联网4s店将为您全程服务</text>
<text class="remarks">同放汽车互联网4s店将为您全程服务</text>
</view>
... ...
... ... @@ -160,6 +160,9 @@ Page({
tuan_data: data.tuan_data,
s4_id: data.s4_id
})
if (that.data.is_share == 1 && data.is_guan == 0) {
that.clickAttentn(data.s4_id)
}
if (data.activity_id) {
let draw_id = data.jump_url
let draw_pos = draw_id.indexOf('id')
... ... @@ -180,6 +183,31 @@ Page({
that.popTest()
}
},
async clickAttentn(s4_id) { // 点击关注
let that = this
try {
const {
data
} = await request({
url: 'api/index2/guan',
data: {
id: s4_id
}
})
if (data.code == 1) {
// a.popSuccessTest(data.msg)
} else {
a.popTest(data.msg)
}
} catch (err) {
// console.log(err);
that.setData({
msg: err.msg
})
that.popTest()
}
},
async clickme() {
let that = this
let token = wx.getStorageSync("token")
... ...
... ... @@ -484,7 +484,7 @@ Page({
let tuanid = options.target.dataset.tuanid
console.log(tuanid,'发送tuanid')
let shareObj = {
title: good_name || "小象团购分享", // 默认是小程序的名称(可以写slogan等)
title: good_name || "同放团购分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/VtuanDetail/VtuanDetail?id=' + good_id + '&tuanid='+tuanid, // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: imgShare, //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
... ...
... ... @@ -212,14 +212,14 @@ Page({
tmplIds: ["dLkIUNEHhOTyzKeh5qWDgecUT8KR11MsC6vZfin8s2o"],
success: (res) => {
if (res['dLkIUNEHhOTyzKeh5qWDgecUT8KR11MsC6vZfin8s2o'] === 'accept') {
wx.showToast({
title: '订阅OK！',
duration: 1000,
success(data) {
//成功
resolve()
}
})
// wx.showToast({
// title: '订阅OK！',
// duration: 1000,
// success(data) {
// //成功
// resolve()
// }
// })
}
},
fail(err) {
... ... @@ -356,7 +356,7 @@ Page({
let good_name = options.target.dataset.good_name
let imgShare = options.target.dataset.imgshare
let shareObj = {
title: good_name || "小象团购分享", // 默认是小程序的名称(可以写slogan等)
title: good_name || "同放团购分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/VtuanDetail/VtuanDetail?id=' + good_id, // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: imgShare, //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
... ...
{
"usingComponents": {},
"navigationBarTitleText": "小象"
"navigationBarTitleText": "同放"
}
\ No newline at end of file
... ...
... ... @@ -9,15 +9,15 @@
<view class="alr">
<view class="act1">
<view class="count">01</view>
<view class="act_txt">添加爱车即可领取100小象积分</view>
<view class="act_txt">添加爱车即可领取100同放积分</view>
</view>
<view class="act1">
<view class="count">02</view>
<view class="act_txt">用车、购车，全程享小象担保服务</view>
<view class="act_txt">用车、购车，全程享同放担保服务</view>
</view>
<view class="act1">
<view class="count">03</view>
<view class="act_txt">家庭所有车辆小象帮您轻松管理（即将上线违章查询、处理功能）</view>
<view class="act_txt">家庭所有车辆同放帮您轻松管理（即将上线违章查询、处理功能）</view>
</view>
</view>
</view>
... ...
... ... @@ -240,7 +240,7 @@ Page({
onShareAppMessage: function () {
let that = this;
return {
title: '小象车孚', // 转发后 所显示的title
title: '同放汽车', // 转发后 所显示的title
path: '/pages/canvasB/canvasB?id=' + that.data.id + '&type=' + that.data.type, //分娩笔记分享2
success: (res) => { // 成功后要做的事情
// console.log(res)
... ...
... ... @@ -219,7 +219,7 @@ Page({
onShareAppMessage: function () {
let that = this;
return {
title: '小象车孚', // 转发后 所显示的title
title: '同放汽车', // 转发后 所显示的title
path: '/pages/canvasC/canvasC?id=' + that.data.id, //分娩笔记分享2
success: (res) => { // 成功后要做的事情
// console.log(res)
... ...
... ... @@ -252,7 +252,7 @@ Page({
}.bind(this), 200)
},
golookfuwu() {
let s4_id = this.data.id
let s4_id = wx.getStorageSync('s4_id');
wx.navigateTo({
url: '/pages/addCarbook/addCarbook?s4_id=' + s4_id
})
... ... @@ -335,7 +335,7 @@ Page({
var that = this;
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象车孚", // 默认是小程序的名称(可以写slogan等)
title: "同放汽车", // 默认是小程序的名称(可以写slogan等)
path: '/pages/carDetails/carDetails?id=' + that.data.id, // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
... ...
... ... @@ -8,7 +8,7 @@ Page({
statusTop: a.globalData.statusHeight,
login: 1, // 3 已登录的 1 登录/注册 2 登录了 未绑定手机号
msg: '',
img: 'https://car.goorcar.com/assets/static/img/person.png',
img: 'https://xiaoxiangauto.com/assets/static/img/person.png',
nickname: '登录/注册',
phone: '未绑定手机号',
che_name: '',
... ...
... ... @@ -157,7 +157,7 @@
<!-- <view class="change_Public">
<view class="left_public">
<image src="{{imagesUrl}}assets/static/img/w_i.png" />
<text class="public_name">小象客服</text>
<text class="public_name">同放客服</text>
</view>
<view class="right_PublicImg">
<image src="{{imagesUrl}}assets/static/img/arrow-you.png" />
... ...
... ... @@ -33,16 +33,16 @@
</view>
</view>
</view>
<!-- 小象积分 -->
<!-- 同放积分 -->
<view class=" integrate public " wx:if="{{status == 1}}">
<text class="integrate_che public_1">小象积分（1000）</text>
<text class="integrate_che public_1">同放积分（1000）</text>
<view class="red_imgs">
<text class="integrate_right public_2">可抵扣100元</text>
<image src="{{imagesUrl}}assets/static/img/radios.png" class="radios_fff" wx:if="{{img == false}}" />
<image src="{{imagesUrl}}assets/static/img/select.png" class="radios_red" wx:else />
</view>
</view>
<!-- 小象积分 若是4S店商品 则隐藏 -->
<!-- 同放积分 若是4S店商品 则隐藏 -->
<view class="integrate4S public" wx:if="{{status == 2}}">
<text class="integrate_4S public_1">4S店积分（800）</text>
<view class="red_imgs">
... ...
... ... @@ -36,7 +36,7 @@
</view>
<view class="jifen">
<view class="integration">
<text>小象积分</text>
<text>同放积分</text>
<text>({{confirmOrder.ping_fen}})</text>
</view>
<view class="commutation" catchtap="usejf">
... ... @@ -80,7 +80,7 @@
</view>
</view>
<view class="explain">
<text class="explain_ ">使用小象积分抵扣不享受积分赠送</text>
<text class="explain_ ">使用同放积分抵扣不享受积分赠送</text>
<view class="r_explain">
<text class="explain__right ">领取</text>
<text class="explain__red ">{{confirmOrder.back_fen}}</text>
... ...
... ... @@ -18,11 +18,11 @@
<!-- <scroll-view class="scrollY" scroll-y="true" style="height:600rpx"> -->
<view class="scrollYtitle">意向购买</view>
<view class="scrollYcontent">
本《意向通用条款与条件》适用于您与本公司（汽车品牌授权经销商）之间意向购买相应车辆型号的汽车。为完成意向购买事宜，您需要向本公司支付约定金额的意向金，由小象平台代为收取，直至您完成《汽车购买协议》签订。在此期间，将由小象平台为您按日给予积分赠送。
本《意向通用条款与条件》适用于您与本公司（汽车品牌授权经销商）之间意向购买相应车辆型号的汽车。为完成意向购买事宜，您需要向本公司支付约定金额的意向金，由同放平台代为收取，直至您完成《汽车购买协议》签订。在此期间，将由同放平台为您按日给予积分赠送。
</view>
<view class="scrollYtitle">购买流程</view>
<view class="scrollYcontent">
我公司将尽快安排与您后续的购车事宜，包括但不限于签订《汽车购买协议》以及其它可能适用的协议。车辆配置详情、车辆总价及服务事项将在《汽车购买协议》中予以约定。虽有前述规定，您及我公司的任何一方均可在《汽车购买协议》签署之前，终止汽车意向购买流程。在意向购买流程根据本条款终止后，小象平台将向您全额退还已收取的意向金，您所获赠的积分仍然有效，无需退回。
我公司将尽快安排与您后续的购车事宜，包括但不限于签订《汽车购买协议》以及其它可能适用的协议。车辆配置详情、车辆总价及服务事项将在《汽车购买协议》中予以约定。虽有前述规定，您及我公司的任何一方均可在《汽车购买协议》签署之前，终止汽车意向购买流程。在意向购买流程根据本条款终止后，同放平台将向您全额退还已收取的意向金，您所获赠的积分仍然有效，无需退回。
</view>
<view class="scrollYtitle">适用法律</view>
<view class="scrollYcontent">
... ... @@ -47,7 +47,7 @@
<view class="pic_icon">￥</view>
<view class="money_count">{{confirmStoreOrder.ding_price}}</view>
</view>
<view class="integral">(小象积分奖励:{{confirmStoreOrder.fen}})分/日</view>
<view class="integral">(同放积分奖励:{{confirmStoreOrder.fen}})分/日</view>
</view>
<view class="total">
<view class="total_money">合计:</view>
... ...
... ... @@ -31,7 +31,7 @@
<view class="collar" wx:else>
至少领
<view class="count_num">{{detailsContent.fen}}</view>
小象积分
同放积分
</view>
</view>
<view class="card_right">
... ... @@ -69,7 +69,7 @@
<view class="collar" wx:else>
至少领
<view class="count_num">{{detailsContent.fen}}</view>
小象积分
同放积分
</view>
</view>
<view class="card_right">
... ... @@ -93,7 +93,7 @@
</view>
<view class="icon_title">保障</view>
</view>
<view class="pub pubone">{{detailsContent.type == 3?'汽车商城':'小象直营'}}</view>
<view class="pub pubone">{{detailsContent.type == 3?'汽车商城':'同放直营'}}</view>
<view class="pub">商品优选</view>
<view class="pub">破损包退</view>
<view class="pub">极速赔付</view>
... ...
... ... @@ -38,7 +38,13 @@ Page({
s4_name: '',
statusTop: a.globalData.statusHeight,
menuTop:'',//导航初始距离顶部
menuFixed:''
menuFixed:'',
video: '',
indicatorDots: true,
vertical: false,
autoplay: false,
interval: 2000,
duration: 500
},
onShow: function () {
console.log('页面再展示')
... ... @@ -54,15 +60,12 @@ Page({
},
onLoad: function (options) {
let that = this
let token = wx.getStorageSync('token')
if (options.scene) {
that.setData({
id: options.scene,
type: 2,
})
// wx.setStorageSync('s4_id', options.s4_id)
// wx.setStorageSync('s4_name', options.s4_name)
} else {
... ... @@ -235,7 +238,8 @@ Page({
content: data.content,
content2: that.text(data.say),
avatar_arr: data.avatar_arr,
can_num: data.can_num
can_num: data.can_num,
video: data.video
})
if (data.is_guan_s4 == 0) {
that.clickAttentn(data.s4_id)
... ...
... ... @@ -26,7 +26,7 @@
height: 136rpx;
display: flex;
align-items: center;
background: url('https://car.goorcar.com/assets/img/yuyue-bg.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/img/yuyue-bg.png') no-repeat;
background-size: 100% 100%;
padding-left: 4rpx;
box-sizing: border-box;
... ...
... ... @@ -7,7 +7,31 @@
</view>
</view>
<view class="details">
<image src="{{klist.img}}" mode="widthFix" />
<swiper indicator-dots="{{indicatorDots}}"
autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" style="height: 375px;">
<swiper-item wx:if="{{klist.video}}">
<video
id="myVideo"
src="{{video}}"
binderror="videoErrorCallback"
show-center-play-btn='{{false}}'
show-play-btn="{{true}}"
controls
picture-in-picture-mode="{{['push', 'pop']}}"
bindenterpictureinpicture='bindVideoEnterPictureInPicture'
bindleavepictureinpicture='bindVideoLeavePictureInPicture'
style="width: 100%;height: 100%;"
></video>
</swiper-item>
<swiper-item>
<image src="{{klist.img}}" mode="widthFix" />
</swiper-item>
<!-- <block wx:for="{{background}}" wx:key="*this">
<swiper-item>
<image src="{{klist.img}}" mode="widthFix" />
</swiper-item>
</block> -->
</swiper>
</view>
<view class="details2">
<view class="botto">
... ...
... ... @@ -50,7 +50,7 @@
height: 136rpx;
display: flex;
align-items: center;
background: url('https://car.goorcar.com/assets/img/yuyue-bg.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/img/yuyue-bg.png') no-repeat;
background-size: 100% 100%;
padding-left: 4rpx;
box-sizing: border-box;
... ...
... ... @@ -193,7 +193,7 @@ Page({
}
},
changeChe(e) { //小象积分
changeChe(e) { //同放积分
let that = this
that.setData({
itemid: e.currentTarget.dataset.id
... ...
... ... @@ -43,7 +43,7 @@
<view class="r_explain">
<!-- <text class="explain__right ">领取</text>
<text class="explain__red ">0</text>
<text class="explain__right ">小象积分</text> -->
<text class="explain__right ">同放积分</text> -->
</view>
</view>
</view>
... ...
... ... @@ -177,7 +177,7 @@ Page({
// console.log(that.data.user_id)
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象分享", // 默认是小程序的名称(可以写slogan等)
title: "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/goAccessories/goAccessories?id=' + that.data.s4_id, // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
... ...
... ... @@ -25,7 +25,7 @@
<view class="collar">
至少领
<text class="count_num">{{detailsContent.fen}}</text>
小象积分
同放积分
</view>
<view class="all_clear collar">
<text class="yun">运费:</text>
... ...
... ... @@ -352,7 +352,7 @@ Page({
var that = this;
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象车孚", // 默认是小程序的名称(可以写slogan等)
title: "同放汽车", // 默认是小程序的名称(可以写slogan等)
path: '/pages/goAccessoriesDetailIMG/goAccessoriesDetailIMG?id=' + that.data.id, // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
success: function (res) {
... ...
... ... @@ -46,7 +46,7 @@
<view class="collar">
至少领
<text class="count_num">{{detailsContent.fen}}</text>
小象积分
同放积分
</view>
<text class="all_clear collar">运费:{{detailsContent.yun}}</text>
</view>
... ...
... ... @@ -97,7 +97,7 @@ Page({
var that = this;
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象分享", // 默认是小程序的名称(可以写slogan等)
title: "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/goPromotion/goPromotion', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
... ...
... ... @@ -45,7 +45,7 @@ page {
.top_new {
width: 100%;
// height: 508rpx;
background: url('https://car.goorcar.com/assets/static/img/v-q.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/v-q.png') no-repeat;
background-size: 100% 100%;
padding: 0 32rpx;
box-sizing: border-box;
... ...
... ... @@ -27,7 +27,7 @@
</view>
</view>
<view class="car_center">
<view class="car_item">
<!-- <view class="car_item">
<view class="car_i_a">
<image src="{{imagesUrl}}assets/static/img/v-k.png" />
<view class="car_i_text">车辆保险</view>
... ... @@ -35,8 +35,8 @@
<view class="car_i_b" wx:if="{{homeGouDay.xian_str!='???天到期'}}">
{{homeGouDay.xian_str}}
</view>
</view>
<view class="car_item" bindtap="goUpkeepimg">
</view> -->
<!-- <view class="car_item" bindtap="goUpkeepimg">
<view class="car_i_a">
<image src="{{imagesUrl}}assets/static/img/v-j.png" />
<view class="car_i_text">车辆保养</view>
... ... @@ -44,8 +44,8 @@
<view class="car_i_b" wx:if="{{homeGouDay.yang_str!='???天到期'}}">
{{homeGouDay.yang_str}}
</view>
</view>
<view class="car_item">
</view> -->
<!-- <view class="car_item">
<view class="car_i_a">
<image src="{{imagesUrl}}assets/static/img/v-l.png" />
<view class="car_i_text">车辆年检</view>
... ... @@ -53,7 +53,7 @@
<view class="car_i_b" wx:if="{{homeGouDay.jian_str!='???天到期'}}">
{{homeGouDay.jian_str}}
</view>
</view>
</view> -->
</view>
<view class="car_d_gong">
<image src="{{imagesUrl}}assets/static/img/v-z.png" />
... ... @@ -84,7 +84,7 @@
<image src="{{imagesUrl}}assets/static/img/v-i.png" />
<view class="nav_text">违章查询</view>
</view> -->
<view class="nav_item" bindtap="goUpkeepimg">
<!-- <view class="nav_item" bindtap="goUpkeepimg">
<image src="{{imagesUrl}}assets/static/img/v-h.png" />
<view class="nav_text">保养预约</view>
</view>
... ... @@ -99,7 +99,7 @@
<view class="nav_item" bindtap="goVopenPolicyB">
<image src="{{imagesUrl}}assets/static/img/v-e.png" />
<view class="nav_text">爱车评估</view>
</view>
</view> -->
</view>
<view class="nav_search" bindtap="goSearch">
<image src="{{imagesUrl}}assets/static/img/v-y.png" />
... ...
... ... @@ -44,7 +44,7 @@ page {
.container .health .top_new {
width: 100%;
background: url('https://car.goorcar.com/assets/static/img/v-q.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/v-q.png') no-repeat;
background-size: 100% 100%;
padding: 0 32rpx;
box-sizing: border-box;
... ...
<view class="container">
<view class="tabs_s ">
<view class="tab_ {{currentT == 1? 'active':''}}" bindtap="clickNum" data-num="1">小象积分</view>
<view class="tab_ {{currentT == 1? 'active':''}}" bindtap="clickNum" data-num="1">同放积分</view>
<view class="tab_ {{currentT == 2? 'active':''}}" bindtap="clickNum" data-num="2">4S店积分</view>
</view>
<view class="padding" wx:if="{{currentT == 1}}">
... ...
... ... @@ -11,7 +11,7 @@ Page({
},
onLoad: function (options) {
// console.log(options);
that.setData({
this.setData({
s4_id: options.s4_id || ''
})
},
... ...
{
"usingComponents": {},
"navigationBarTitleText": "小象服务"
"navigationBarTitleText": "同放服务"
}
\ No newline at end of file
... ...
... ... @@ -7,11 +7,11 @@
<view class="text_title">绑定4S店</view>
<view class="textQIT" wx:if="{{bind}}">
<view class="ITE">您尚未选择4S店服务</view>
<view class="ITE">绑定4S店购物领取小象积分尊享更多服务</view>
<view class="ITE">绑定4S店购物领取同放积分尊享更多服务</view>
</view>
<view class="qit" wx:else>
<view class="ITE">您已绑定4S店，小象积分可至绑定店现金抵用！</view>
<view class="ITE">小象平台将为您提供第三方保障</view>
<view class="ITE">您已绑定4S店，同放积分可至绑定店现金抵用！</view>
<view class="ITE">同放平台将为您提供第三方保障</view>
</view>
</view>
<view class="change_4S" catchtap="go4Ssearch">
... ... @@ -26,8 +26,8 @@
<view class="banner_img_title">
<view class="text_title">绑定4S店</view>
<view class="qit">
<view class="">您已绑定4S店，小象积分可至绑定店现金抵用！</view>
<view class="">小象平台将为您提供第三方保障</view>
<view class="">您已绑定4S店，同放积分可至绑定店现金抵用！</view>
<view class="">同放平台将为您提供第三方保障</view>
</view>
</view>
<view class="picker_1">{{S4SList.name}}</view>
... ...
... ... @@ -206,7 +206,7 @@ Page({
}
},
changeChe() { //小象积分
changeChe() { //同放积分
if (this.data.img1) {
this.setData({
img1: false,
... ...
... ... @@ -55,9 +55,9 @@
<text class="remarks_ public_1">备注</text>
<text class="service_right public_2" bindtap="clickme">{{bei}}</text>
</view>
<!-- 小象积分 -->
<!-- 同放积分 -->
<view class=" integrate public ">
<text class="integrate_che public_1">小象积分（{{myOrderForm.ping_fen}}）</text>
<text class="integrate_che public_1">同放积分（{{myOrderForm.ping_fen}}）</text>
<view class="red_imgs" catchtap="changeChe">
<text class="integrate_right public_2">{{myOrderForm.ping_money}}</text>
<image src="{{imagesUrl}}assets/static/img/radios.png" class="radios_fff" wx:if="{{img == false}}" />
... ... @@ -115,7 +115,7 @@
</view>
<!-- 说明 explain -->
<view class="explain">
<text class="explain_ ">使用小象积分抵扣不享受积分赠送</text>
<text class="explain_ ">使用同放积分抵扣不享受积分赠送</text>
<view class="r_explain">
<text class="explain__right ">领取</text>
<text class="explain__red ">{{fen}}</text>
... ...
... ... @@ -48,6 +48,12 @@
</view>
<view class="up_cont">已退款</view>
</view>
<view class="up_txt" wx:if="{{way == 10}}">
<view class="up_img">
<image src="{{imagesUrl}}assets/static/img/tuikuan_icon@2x (1).png" />
</view>
<view class="up_cont">拒绝退款</view>
</view>
</view>
<!-- 普通 -->
<view class="obligation">
... ... @@ -154,7 +160,7 @@
立即支付
</button>
</view>
<view class="downbtn" wx:if="{{way == 3}}">
<view class="downbtn" wx:if="{{way == 3 || way == 10}}">
<button class="btn1 btn " catchtap="returnMoney" data-order_no="{{OrderObligation.order_no}}">
申请退款
</button>
... ...
... ... @@ -22,7 +22,7 @@
<!-- 付定金 -->
<view class="Deposit">
<view class="list_count">
<!-- <view class="list_title" >小象商品</view> -->
<!-- <view class="list_title" >同放商品</view> -->
<view class="list_title">{{OrderObligation.shop}}</view>
<view class="list">
<view class="left_imgs">
... ... @@ -60,7 +60,7 @@
<text class="price">{{ConfirmAnOrder.ding_price}}</text>
</view>
<!-- <text class="red_money red">￥2600.00</text> -->
<text class="red_money gray">小象积分总收益:</text>
<text class="red_money gray">同放积分总收益:</text>
<text class="red_money addd">{{OrderObligation.fen}}</text>
<text class="red_money gray">分</text>
</view>
... ...
... ... @@ -11,12 +11,13 @@ Page({
data: {
userMsg:'',
s4:"",
tablist:['未领取','已领取'],
tablist:['待领取','已领取'],
drawid: 0,
active: 0,
active: 1,
prizeList: [],
s4_name: '',
showGetMydetail: false,
banner: '',
myDetail: []
},
... ... @@ -24,6 +25,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options,111);
this.setData({
drawid: options.drawid,
s4_name: wx.getStorageSync('s4_name'),
... ... @@ -31,9 +33,27 @@ Page({
userMsg:JSON.parse(options.userMsg),
s4:wx.getStorageSync('s4_name')
})
},
onShow(){
this.getBanner()
this.getMyjiang()
},
getBanner(){
request({
url: 'api/chou_banner/get_banner',
data: {}
}).then((res) => {
console.log(res)
this.setData({
banner: res.data.data[0]['image']
})
})
},
toscore(){
wx.switchTab({
url: '/pages/stores/index',
})
},
onClick(event) {
console.log(event)
wx.showToast({
... ... @@ -86,8 +106,15 @@ Page({
data: {
log_id: thisDraw
}
}).then((res) => {
if(res.code == 1) {
a.popTest('领取成功')
} else {
a.popTest(res.msg)
}
}).catch((err) => {
a.popTest(err.msg)
})
a.popTest('领取成功')
}
})
},
... ...
... ... @@ -2,5 +2,6 @@
"usingComponents": {
"van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index"
}
},
"navigationBarTitleText": "我的奖品"
}
\ No newline at end of file
... ...
<view class="myPrize">
<image src="{{banner}}" mode="aspectFill" style="height: 300rpx;" bindtap="toscore"></image>
<view class="mp-tab">
<!-- <van-tabs bind:click="onClick">
<van-tab title="未领取"></van-tab>
... ... @@ -28,7 +29,7 @@
<text class="mytxt" hidden="{{item.type_id == 1}}">请前往合作经销商获取</text>
<view class="myitem" bindtap="getMydetail">
<text>领取信息</text>
<image src="https://car.goorcar.com/assets/draw3/Frame765@2x.png"></image>
<image src="https://xiaoxiangauto.com/assets/draw3/Frame765@2x.png"></image>
</view>
</view>
</view>
... ... @@ -50,7 +51,7 @@
</view>
<view class="myDetail">
<text>关注车系</text>
<text style="color:grey">小象正在考虑...</text>
<text style="color:grey">同放正在考虑...</text>
</view>
<view class="button" bindtap="closeMydetail">确定</view>
</view>
... ...
... ... @@ -25,7 +25,7 @@
<view class="collar">
至少领
<text class="count_num">{{detailsContent.fen}}</text>
小象积分
同放积分
</view>
<view class="all_clear collar">
<text class="yun">运费:</text>
... ...
... ... @@ -78,7 +78,7 @@
<view class="collar">
至少领
<text class="count_num">{{detailsContent.fen}}</text>
小象积分
同放积分
</view>
<view class="all_clear collar">
<text class="yun">运费:</text>
... ...
... ... @@ -58,7 +58,7 @@
align-items: center;
padding: 20rpx;
box-sizing: border-box;
background: url('https://car.goorcar.com/assets/static/img/bg_img02.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/bg_img02.png') no-repeat;
background-size: 100% 100%;
border-radius: 16rpx 16rpx 0 0;
... ... @@ -248,7 +248,7 @@
.receive {
border-radius: 16rpx;
background: url('https://car.goorcar.com/assets/static/img/bg_img01.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/bg_img01.png') no-repeat;
background-size: 100% 100%;
}
... ...
... ... @@ -47,7 +47,7 @@
align-items: center;
padding: 20rpx;
box-sizing: border-box;
background: url('https://car.goorcar.com/assets/static/img/bg_img02.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/bg_img02.png') no-repeat;
background-size: 100% 100%;
border-radius: 16rpx 16rpx 0 0;
}
... ... @@ -201,7 +201,7 @@
}
.container .padding .packets .receive {
border-radius: 16rpx;
background: url('https://car.goorcar.com/assets/static/img/bg_img01.png') no-repeat;
background: url('https://xiaoxiangauto.com/assets/static/img/bg_img01.png') no-repeat;
background-size: 100% 100%;
}
.container .padding .text_box {
... ...
... ... @@ -7,7 +7,7 @@ Page({
imagesUrl: a.globalData.baseUrl,
statusTop: a.globalData.statusHeight,
active: 1,
_num: 1, // 1 小象 2 4S店
_num: 1, // 1 同放 2 4S店
S4sShopList: [], // 4s店
shopCart: [],
num: 1, // 购物数量
... ... @@ -26,7 +26,8 @@ Page({
onLoad: function (options) {},
onShow: function () {
this.setData({
_num: 1
_num: 1,
Cheid: []
})
this.getShopCart()
},
... ... @@ -237,7 +238,7 @@ Page({
that.goLogin()
}
},
toPayStore() { // 去结算 小象
toPayStore() { // 去结算 同放
// console.log(this.data.Cheid, "Cheid");
let that = this
let cheid = that.data.Cheid
... ... @@ -252,7 +253,7 @@ Page({
}
},
async delStoreAll(e) { //小象 删除
async delStoreAll(e) { //同放 删除
let that = this
let ids = e.currentTarget.dataset.id
let list = that.data.shopCart
... ... @@ -277,7 +278,7 @@ Page({
},
changeTitle(e) { // 切换 4sdian 小象
changeTitle(e) { // 切换 4sdian 同放
let way = e.currentTarget.dataset.num
this.setData({
... ...
... ... @@ -13,7 +13,7 @@
<view class="right_totd ">4S店商品</view>
</view>
</view>
<!-- 小象商品 -->
<!-- 同放商品 -->
<view class="list_cart" wx:if="{{_num == 1}}">
<block wx:if="{{shopCart.length ==0 }}">
<view class="emmpty4S" bindtap="goGuang" wx:if="{{it_car == true}}">
... ... @@ -21,7 +21,7 @@
<image src="{{imagesUrl}}assets/static/img/web2x_gouwuche_img.png" />
</view>
<view class="textName">
<view class="c">商城购物领取小象积分可以至4S店现金抵用</view>
<view class="c">商城购物领取同放积分可以至4S店现金抵用</view>
<view class="2">快去装满你的购物车吧</view>
</view>
</view>
... ...
... ... @@ -26,7 +26,7 @@
<view class="collar">
至少领
<text class="count_num">{{storeMaintain.fen}}</text>
小象积分
同放积分
</view>
</view>
</view>
... ...
... ... @@ -106,7 +106,7 @@ Page({
var that = this;
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象车孚", // 默认是小程序的名称(可以写slogan等)
title: "同放汽车", // 默认是小程序的名称(可以写slogan等)
path: '/pages/storeMaintainImg/storeMaintainImg?id=' + that.data.id, // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
success: function (res) {
... ...
... ... @@ -46,7 +46,7 @@
<view class="collar">
至少领
<text class="count_num">{{MaintainImg.fen}}</text>
小象积分
同放积分
</view>
<!-- <text class="all_clear collar">运费:{{MaintainImg.yun_str}}</text> -->
</view>
... ... @@ -79,7 +79,7 @@
<view class="collar">
至少领
<text class="count_num">{{MaintainImg.fen}}</text>
小象积分6566
同放积分6566
</view>
</view>
</view>
... ...
... ... @@ -429,7 +429,7 @@ Page({
onShareAppMessage(options) {
var that = this;
var shareObj = {
title: "小象车孚",
title: "同放汽车",
path: '/pages/stores/index',
imageUrl: '',
};
... ...
... ... @@ -187,7 +187,7 @@ Page({
},
changeChe() { //小象积分
changeChe() { //同放积分
if (this.data.img1) {
this.setData({
img1: false,
... ...
... ... @@ -49,9 +49,9 @@
<view class="remarks_ public_1">备注</view>
<view class="service_right public_2" bindtap="clickme">{{bei}}</view>
</view>
<!-- 小象积分 -->
<!-- 同放积分 -->
<view class=" integrate public ">
<view class="integrate_che public_1">小象积分（{{orderContent.ping_fen}}）</view>
<view class="integrate_che public_1">同放积分（{{orderContent.ping_fen}}）</view>
<view class="red_imgs" catchtap="changeChe">
<view class="integrate_right public_2">{{orderContent.ping_money}}</view>
<view class="changeIMg">
... ... @@ -60,7 +60,7 @@
</view>
</view>
</view>
<!-- 小象积分 若是4S店商品 则隐藏 -->
<!-- 同放积分 若是4S店商品 则隐藏 -->
<view class="integrate4S public" wx:if="{{use_fen_id!=1}}">
<view class="integrate_4S public_1">4S店积分（{{orderContent.s4_fen}}）</view>
<view class="red_imgs" catchtap="change4S">
... ... @@ -113,7 +113,7 @@
</view>
<!-- 说明 explain -->
<view class="explain">
<view class="explain_ ">使用小象积分抵扣不享受积分赠送</view>
<view class="explain_ ">使用同放积分抵扣不享受积分赠送</view>
<view class="r_explain">
<view class="explain__right ">领取</view>
<view class="explain__red ">{{orderContent.fen}}</view>
... ...
... ... @@ -265,7 +265,7 @@ Page({
var that = this;
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: "小象分享", // 默认是小程序的名称(可以写slogan等)
title: "同放分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/upkeepImg/upkeepImg', // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
... ...
{
"description": "项目配置文件",
"description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"packOptions": {
"ignore": []
"ignore": [],
"include": []
},
"setting": {
"urlCheck": true,
... ... @@ -39,16 +40,14 @@
"disableUseStrict": false,
"showES6CompileOption": false,
"useCompilerPlugins": false,
"minifyWXML": true
"minifyWXML": true,
"ignoreUploadUnusedFiles": true,
"useStaticServer": true
},
"compileType": "miniprogram",
"libVersion": "2.12.3",
"appid": "wx11011d1f9492b8e0",
"projectname": "chemai2",
"debugOptions": {
"hidedInDevtools": []
},
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
... ... @@ -113,5 +112,9 @@
}
]
}
},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
}
}
\ No newline at end of file
... ...
{
"setting": {},
"condition": {
"plugin": {
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"list": []
},
"miniprogram": {
"list": [
{
... ... @@ -27,10 +18,19 @@
{
"name": "抽奖结果",
"pathName": "pages/myPrize/myPrize",
"query": "id=9&",
"query": "drawid=68&type=1",
"launchMode": "default",
"scene": null
},
{
"name": "调试弹窗内容",
"pathName": "package/pages/LuckDraw/LuckDraw",
"query": "id=68",
"launchMode": "default",
"scene": null
}
]
}
}
},
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
}
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
export const request = (params) => {
wx.showNavigationBarLoading()
// const baseUrl = "http://chemai.t.brotop.cn/"
const baseUrl = "https://car.goorcar.com/"
const baseUrl = "https://xiaoxiangauto.com/"
// const baseUrl = "http://test.xiaoxiangauto.com/"
return new Promise((resolve, reject) => {
... ...