Skip to content

7
7-Eleven
Commit 8f5ad584 by 赵雅纹
Options

Merge branch 'fixbug-ZYW' into 'dev_7.1.0' 

Fixbug zyw

See merge request !165
parents 8643eb74 3ad0b41e
Showing with 98 additions and 36 deletions
src/app.js
......@@ -124,8 +124,8 @@ App({
// brandId: 2711,
// brandId: 2005,
// brandId: 1001,
brandId: 1002,
// brandId: 3001,
// brandId: 1002,
brandId: 3001,
// brandId: 3002,
}
})
src/component/bottomTabs/bottomTabs.wxml
......@@ -44,7 +44,7 @@
</view>
<view class="bottom-tab bgc fixed-bottom0" wx:if="{{tabBar.num == 5}}">
<block wx:for="{{tabBarList}}" wx:key="{{index}}" wx:for-item="tab">
<view class="tab" data-item="{{tab}}" bindtap="handelToPage">
<view class="tab" data-item="{{tab}}">
<!--当前页面需要授权 且未授权-->
<view wx:if="{{tab.needAuth}}" class="btn-tab">
<view wx:if="{{!currentHasUserInfo}}" class="btn-tab">
......
src/component/html2wxml/wxHtml.wxss
/* component/html2wxml/wxHtml.wxss */
@import '../../wxParser/index.wxss';
/* .wxParser image {
.wxParser image {
width:100%;
}
/* .wxParser .wxParser-p{
text-align: center;
} */
\ No newline at end of file
src/component/personCenter/personCenter.wxml
......@@ -57,7 +57,7 @@
</view>
</view>
<!--plus-->
<view class='df tc person-num' wx:if='{{currentMobile}}'>
<!-- <view class='df tc person-num' wx:if='{{currentMobile}}'>
<image class="" src='{{currentPlusStyle.imageUrl}}' data-row="{{currentPlusStyle.row}}" mode="widthFix" bindtap="toPlusPay"/>
</view>
</view> -->
src/component/scrollDel/scrollDel.js
......@@ -62,6 +62,13 @@ Component({
this.triggerEvent('addNumChange', index)
})
},
//item点击
bindTapItem(e){
let productId = e.currentTarget.dataset.id;
if (productId){
wxService.router('/pages/productDetail/productDetail?id=' + productId);
}
},
blurNum(e){
// value index
var index = e.currentTarget.dataset.index
......
src/component/scrollDel/scrollDel.wxml
......@@ -3,10 +3,11 @@
<scroll-view scroll-y="{{isScroll}}">
<block class="cart-item" wx:key="item" wx:for="{{cartList}}">
<view data-index='{{index}}' class="order-item cart-list" bindtouchstart="drawStart" bindtouchmove="drawMove" bindtouchend="drawEnd" style="right:{{item.right}}rpx">
<view data-index="{{index}}">
<icon size="16" type="{{item.checked ? 'success' : 'circle'}}" color="{{checkedColor}}" data-index="{{index}}" catchtap="checkPro"></icon>
<view data-index="{{index}}" class="checke-item" catchtap="checkPro">
<icon size="18" type="{{item.checked ? 'success' : 'circle'}}" color="{{checkedColor}}" data-index="{{index}}" ></icon>
</view>
<view class="pro-info">
<!-- bindtap="bindTapItem" data-id="{{item.id}}" -->
<view class="pro-info" bindtap="bindTapItem" data-id="{{item.productId}}">
<image class="pro-img" src="{{item.skuImgUrl}}" mode="widthFix"></image>
<view class="pro-right-info">
<view class="pro-name">{{item.productName}}</view>
......
src/component/scrollDel/scrollDel.wxss
......@@ -35,8 +35,17 @@
align-items: center;
flex-shrink: 0;
}
.checke-item{
flex: 0;
min-width: 48rpx;
max-width: 48rpx;
height: 180rpx;
display: flex;
align-items: center;
}
.pro-info{
margin-left: 24rpx;
/* margin-left: 24rpx; */
flex: 1;
display: flex;
border-bottom: 1rpx solid rgba(151,151,151,0.3);
......
src/component/waterFlowLayout/waterFlowLayout.wxss
......@@ -61,9 +61,14 @@
padding: 10rpx;
}
.share-oprate{
display: flex;
align-items: center;
}
.share-img{
width: 20rpx;
height: 20rpx;
width: 28rpx;
height: 28rpx;
}
.share-number{
font-size: 24rpx;
......
src/config/index.js
const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const needMock = '' //
// appid_dev_wx wxc3b64b09b1d3dfc2
......
src/pages/cart/cart.wxml
......@@ -41,7 +41,7 @@
</view>
</view>
</view>
<!-- 空状态时 -->
<view class="empty" wx-if="{{cartList !== null && cartList.length == 0}}">
<view class="empty-img">
<image class="no-cart-img" src="/assets/imgs/7_1_0/08_22/no-cart.png" mode="widthFix" />
......@@ -54,7 +54,7 @@
<view class="cart-bottom">
<view class="total">
<view class="select-radio all-radio" bindtap="checkAll">
<icon type="{{checkAll ? 'success' : 'circle'}}" color="{{checkedColor}}" size="16" />
<icon type="{{checkAll ? 'success' : 'circle'}}" color="{{checkedColor}}" size="18" />
<text class="all" >全选</text>
</view>
<view class="total-amount">
......
src/pages/wantToBuyDetail/wantToBuyDetail.wxml
......@@ -4,17 +4,6 @@
<buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}" />
<view class="buy-desc">
<view> <x-html html="{{contentInfo.article}}" /></view>
<view class="share-wrap">
<view class="share-oprate" bindtap="gotoLike">
<image class="share-img" src="{{contentInfo.type ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}" />
<text class="share-number">{{contentInfo.enjoySum || 0}}</text>
</view>
<view class="share-oprate" bindtap="onTapShare">
<image class="share-img" src="/assets/imgs/share.png" />
<text class="share-number">{{contentInfo.transmitSum || 0}}</text>
</view>
</view>
</view>
<view class="buy-product-wrap">
<view class="buy-product-content">
......@@ -39,6 +28,21 @@
</view>
</view>
</view>
<!-- 点赞分享悬浮 -->
<view class="fixed-bottom">
<view class="share-wrap">
<view class="share-oprate" bindtap="gotoLike">
<image class="share-img" src="{{contentInfo.type ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}" />
<text class="share-number">{{contentInfo.enjoySum || 0}}</text>
</view>
<view class="share-oprate" bindtap="onTapShare">
<image class="share-img" src="/assets/imgs/share.png" />
<text class="share-number">{{contentInfo.transmitSum || 0}}</text>
</view>
</view>
</view>
<card-modal
show-card-modal="{{showCardModal}}"
card-title="{{cardTitle}}"
......
src/pages/wantToBuyDetail/wantToBuyDetail.wxss
......@@ -2,6 +2,7 @@
@import './../../base/base.wxss';
page{
background: #ffffff;
padding-bottom: 80rpx;
}
scroll-view{
height: 100%;
......@@ -45,15 +46,22 @@ swiper {
.buy-desc{
padding: 0 30rpx;
}
.share-oprate{
display: flex;
align-items: center;
}
.share-wrap{
display: flex;
justify-content: space-between;
margin-top: 31rpx;
align-items: center;
/* margin-top: 31rpx; */
}
.share-img{
width: 20rpx;
height: 20rpx;
width: 28rpx;
height: 28rpx;
}
.share-number{
font-size: 24rpx;
......@@ -129,6 +137,17 @@ swiper {
float: right;
}
.fixed-bottom{
position: fixed;
width: 100%;
height: auto;
bottom: 0;
left: 0;
padding: 20rpx;
box-sizing: border-box;
background: #ffffff;
border-top: solid 1px #eee;
}
......
src/project.config.json
......@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.8.2",
"appid": "wxac09792264c49b5c",
"appid": "wx313ec36b710125d4",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": {
"hidedInDevtools": []
......
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxss
......@@ -86,9 +86,15 @@ page{
font-size: 26rpx;
font-family: PingFangSC-Medium;
}
.share-oprate{
display: flex;
align-items: center;
}
.share-img{
width: 20rpx;
height: 20rpx;
width: 28rpx;
height: 28rpx;
}
.share-number{
font-size: 24rpx;
......
src/subPackage/page/pages/subPage/subPage.js
......@@ -54,6 +54,12 @@ wxService.page({
handlerDataOnPage = new utils.HandlerDataOnPage()
renderPage = require('../../../../utils/renderPage').getRenderPage()
handlerDataOnPage.init(this, 'pages')
if (this.options['scene']) {
let idParam = decodeURIComponent(this.options['scene']).split('&')[0];
let shareId = idParam && idParam.split('=')[1] || 0;
this.options.pageId = shareId;
}
this.setData({
pageId: this.options.pageId
},()=>{
......
src/utils/Http.js
......@@ -99,8 +99,8 @@ class Http {
url,
method: 'GET',
header: {
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
// 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
'tentacle-content': this.getTentacle(),
// 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
......@@ -131,8 +131,8 @@ class Http {
url,
method: 'POST',
header: {
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
// 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
'tentacle-content': this.getTentacle()
// 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
},
......
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