Skip to content

7
7-Eleven
Commit 45e60ccb by 赵雅纹
Options

Merge branch 'feature-zyw-sc' into 'dev_7.1.0' 

Feature zyw sc

See merge request !102
parents 243e7bda 8cb518a1
Showing with 81 additions and 45 deletions
src/pages/extendProduct/extendProduct.js
......@@ -52,7 +52,7 @@ wxService.page({
this.getExtendProList(1,10)
} else if (current == 1) {
// 我的推广
wx.hideShareMenu();
// wx.hideShareMenu();
this.getMyShareCount()
this.getMyExtendOrderList(1,10)
}
......@@ -126,7 +126,7 @@ wxService.page({
}
let tentacleInfo = {
content: JSON.stringify(this.data.proData),
contentType: 2, //内容类型 1.文章 2.商品 3.页面
contentType: app.globalData.contants.SHARE_TYPE.GOODS, //内容类型 1.文章 2.商品 3.页面
title: this.data.proData[0].productName,
type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
......@@ -142,7 +142,7 @@ wxService.page({
this.setData({
showCardModal: true,
cardTitle: this.data.proData[0].productName,
cardUrl: this.data.proData[0].url,
cardUrl: this.data.proData[0].productImgUrl,
pagePath: path
});
}
......@@ -184,26 +184,22 @@ wxService.page({
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
let extendData = []
// for (var i in data.content){
// //内容类型 1.文章 2.商品 3.页面
// if (data.content[i].contentType != 3){
// console.log('=====', data.content[i].content)
// console.log('--------', JSON.parse(data.content[i].content))
// var content = JSON.parse(data.content[i].content)
// data.content[i].content = content
// }
// }
data.content.forEach((item) =>{
//内容类型 1.文章 2.商品 3.页面
if (item.content){
if (item.contentType == 3){
item.content = item.content
}else{
let content = JSON.parse(item.content)
item.contentArr = [content]
}
}
})
this.setData({
myExtendList: this.data.pageNum == 1 ? [...data.content] : [...this.data.myExtendList, ...data.content],
myTotalPages: data.totalPages
}, () => {
// this.setData({
// no_data: this.data.orderList.length ? true : false
// })
})
console.log('00000', this.data.myExtendList)
}
}
})
......@@ -314,9 +310,9 @@ wxService.page({
}
let tentacleInfo = {
content: this.route,
title: this.route,
contentType: 3,
content: '推广商品',
title: '推广商品',
contentType: app.globalData.contants.SHARE_TYPE.PAGE,
type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
};
wxService.getTentacleContent(tentacleInfo).then(res => {
......
src/pages/extendProduct/extendProduct.wxml
......@@ -49,12 +49,12 @@
<button class="btn btn-primary">预计赚5元红包</button>
</view> -->
<view class="benefit-info">
<view class="benefit-point">
<view class="benefit-point" wx:if="{{item.point}}">
<image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix" />
<text class="benefit-num">{{item.point}}</text>
</view>
<view class="coupon-title">
<image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix" />
<image src="/assets/imgs/7_1_0/rmb.png" class="coupon-icon" mode="widthFix" wx:if="{{item.shareBonuses && item.shareBonuses.length > 0}}" />
<block
wx:for="{{item.shareBonuses}}"
wx:for-item="shareItem"
......@@ -112,24 +112,32 @@
wx:key="{{index}}"
wx:for-item="extendItem"
>
<navigator url="/subPackage/page/pages/orderBenefit/orderBenefit" hover-class="none">
<view class="order-header">
<view class="order-number">
<text>{{extendItem.createTime}}</text>
</view>
<text class="order-status">查看收益</text>
</view>
<view class="pro-list">
<image class="pro-img" />
<image class="pro-img" />
<image class="pro-img" />
<view class="pro-list" wx:if="{{extendItem.contentArr}}" wx:for="{{extendItem.contentArr}}" wx:for-item="contentItem" wx:key="{{index}}" >
<image class="pro-img" src="{{contentItem.url}}" />
<!-- <image class="pro-img" />
<image class="pro-img" />
<image class="pro-img" /> -->
<text class="pro-img-dot">...</text>
</view>
<view class="pro-list" wx:if="{{!extendItem.contentArr}}">
<!-- <image class="pro-img" />
<image class="pro-img" />
<image class="pro-img" /> -->
<text class="pro-img-dot">{{extendItem.content}}</text>
</view>
<view class="pro-number">
<text class="total-pro">促成订单 <text class="help-order">5</text>
笔
<text class="total-pro">促成订单 <text class="help-order">5</text>笔
</text>
</view>
</navigator>
</view>
</view>
<view class="loading-complete">已经到底啦！</view>
......
src/pages/extendProduct/extendProduct.wxss
......@@ -144,7 +144,16 @@ swiper {
display: flex;
justify-content: space-around;
height: 88rpx;
line-height: 88rpx;
align-items: center;
}
.share-button{
width: 200rpx;
height: 52rpx;
line-height: 52rpx;
border-radius: 26rpx;
background-color: rgba(216, 216, 216, 0.4);
text-align: center;
font-size: 26rpx;
}
.share-button image{
width: 18rpx;
......@@ -212,7 +221,7 @@ swiper {
.pro-img{
width: 140rpx;
height: 140rpx;
border:1px solid red;
/* border:1px solid red; */
vertical-align: middle;
}
.pro-img-dot{
......@@ -255,6 +264,7 @@ swiper {
}
.benefit-num{
font-size: 18rpx;
margin-left: 15rpx;
}
.benefit-point{
margin-right: 30rpx;
......
src/subPackage/page/pages/myInvite/myInvite.js
......@@ -77,8 +77,8 @@ wxService.page({
// 邀请会员列表
getInviteMemberList(){
let params = {
userId: memberId,
tentacleType: 3
// userId: memberId,
// tentacleType: 3
}
wx.showLoading({
title: '加载中',
......
src/subPackage/page/pages/plus/plus.js
// subPackage/home/pages/plus/plus.js
const app = getApp()
const wxService = require('../../../../utils/wxService')
import { Integer } from '../../../../utils/integerDigitalConvertion'
wxService.page({
/**
......@@ -75,6 +78,21 @@ wxService.page({
* 用户点击右上角分享
*/
onShareAppMessage: function () {
console.log('00000', app.globalData.contants)
let tentacleInfo = {
content: 'plus购买页',
title: 'plus购买页',
contentType: app.globalData.contants.SHARE_TYPE.PAGE,
type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
};
wxService.getTentacleContent(tentacleInfo).then(res => {
if (res && res.tentacleId) {
let tentacleId = Integer.digit(res.tentacleId, 10, 64);
var path = `subPackage/page/pages/plus/plus?t=${tentacleId}`;
return {
path: path
}
}
});
}
})
src/subPackage/page/pages/share/share.js
......@@ -2,6 +2,8 @@ import Card from '../../../../palette/inviteFriends';
var app = getApp()
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
import { Integer } from '../../../../utils/integerDigitalConvertion'
// src/pages/xml2can/xml2can.js
wxService.page({
......@@ -30,6 +32,7 @@ wxService.page({
onShow: function () {
this.getShareImg()
this.getMiniCode()
},
//轮播图的切换事件
......@@ -104,13 +107,10 @@ wxService.page({
// 保存海报
savePoster(){
let content = {
currentPosterImg: this.data.currentPosterImg
}
let tentacleInfo = {
content: JSON.stringify(content),
contentType: 3, //内容类型 1.文章 2.商品 3.页面
title: '首页', //标题
content: "我的邀请",
contentType: app.globalData.contants.SHARE_TYPE.PAGE, //内容类型 1.文章 2.商品 3.页面
title: '我的邀请', //标题
type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
......
src/utils/const.js
export default {
const contants = {
SHARE_TYPE : {
CONETNT : 1,
GOODS : 2,
PAGE : 3
CONETNT: 1, //内容
GOODS: 2, //商品
PAGE: 3 //页面
}
}
module.exports = contants
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment