Skip to content

7
7-Eleven
Commit 79c8c869 by 谢中龙
Options

删除功能和多余的文件

parent 72a42b58
Showing with 132 additions and 53 deletions
src/app.js
......@@ -4,7 +4,9 @@ const Promise = require('lib/bluebird')
var utils = require('utils/util.js')
var commonFunc = require('utils/common.js')
var contants = require('utils/const.js')
var cityJson = require('utils/city.js')
// var cityJson = require('utils/city.js')
var cityJson = require('utils/hotwindCity.js')
var wxService = require('utils/wxService')
let config = require('./configScreen/configScreen');
const envInfo = require('config/index').envInfo
......
src/app.json
......@@ -64,9 +64,9 @@
"pages/myValueCardInfo/myValueCardInfo",
"pages/valueCardRecords/valueCardRecords",
"pages/chooseStore/chooseStore",
"pages/shareConfig/shareConfig",
"pages/selfPickUpOrderList/selfPickUpOrderList",
"pages/selfPickUpOrderInfo/selfPickUpOrderInfo",
"pages/shareConfig/shareConfig",
"pages/liveVideo/liveVideo",
"pages/couponCenter/couponCenter",
"pages/couponCenterInfo/couponCenterInfo"
......@@ -107,7 +107,7 @@
"window": {
"backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "WeChat",
"navigationBarTitleText": "小程序",
"navigationBarTextStyle": "black"
},
"navigateToMiniProgramAppIdList": [
......
src/component/bottomTabs/bottomTabs.wxml
......@@ -2,7 +2,7 @@
<wxs src="../../wxs/utils.wxs" module="utils" />
<!--<wxs src="./handlerData.wxs" module="tools" />-->
<view class='bgc fixed-bottom0'
style="background-image:url({{tabBar.num == 4 ? '': '/assets/imgs/7_1_0/bg.png'}});"
style="background-image:url({{tabBar.num == 4 ? '': 'https://img3.bigaka.com/prd/3001/202003/20200309/3001fda28a82-5b79-44f4-b9d0-b0d9bf7fa7d0.png'}});"
wx:if="{{tabBar.num == 4}}">
<block wx:for="{{tabBarList}}" wx:key="*this" wx:for-item="tab">
<view class="tab">
......
src/component/productListStyleTwo/productListStyleTwo.wxml
......@@ -29,7 +29,7 @@
<view class="">
<image
class="item-plus"
src="./../../assets/imgs/7_1_0/plus.png"
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001fce746fd-c6f9-4016-bc0a-9aee0ac93f7a.png"
mode="widthFix"
lazy-load="false"
/>
......
src/component/shareModal/shareModal.wxml
<!--component/shareModal/shareModal.wxml-->
<view class="modal-container" bindtap="hidePopup" hidden="{{!show}}"></view>
<view class="modal-content" hidden="{{!show}}" bindtap="hidePopup">
<image style="height:{{shareHight}}" src="/assets/imgs/7_1_0/share-modal.png"></image>
<image style="height:{{shareHight}}"
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001ea6d0d3e-23cb-4889-b34f-3b3d2e7621f0.png"></image>
</view>
<view class="share-modal-list " id="bottom-query" hidden="{{!show}}">
<view class="share-modal-item" bindtap="onTapForward">转发</view>
......
src/config/index.js
......@@ -113,7 +113,7 @@ const prod_brand_config = {
appId: 'wx313ec36b710125d4',// 小程序AppID
tunnelToken: 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8',//商户默认token
brandId: 3001,//商户ID
plusIsOpen: false, //下单和下单状态界面是否显示购买plus
plusIsOpen: true, //下单和下单状态界面是否显示购买plus
contactUsIsOpen: true,//是否开启联系我
contactUsPluginId: '766c50920993bf9c41c6c3d2761a2df5',//联系我们插件PluginID
hasTrial: false, // 是否有体验账号
......
src/custom-tab-bar/index.wxml
<cover-view class="tab-bar" style="height:{{currentHeight}}px">
<!-- 背景图片 -->
<cover-image class='tab-bar-bg' src='/assets/imgs/7_1_0/bg.png' />
<cover-image class='tab-bar-bg'
src='https://img3.bigaka.com/prd/3001/202003/20200309/3001fda28a82-5b79-44f4-b9d0-b0d9bf7fa7d0.png' />
<!-- 首页 -->
<cover-view
class='tab-bar-index'
......
src/pages/addAddress/addAddress.js
// pages/addAddress/addAddress.js
const wxService = require('../../utils/wxService')
const city = require('../../utils/city')
const hotwindCity = require('../../utils/hotwindCity')
const city = require('../../utils/hotwindCity')
const { memberId } = wx.getStorageSync('_baseUserInfo');
const envInfo = require('../../config/index').envInfo;
......@@ -69,7 +68,7 @@ wxService.page({
let cityData = [];
//热风地址库特殊处理
if (envInfo.brandId == 2010){
cityData = hotwindCity.default;
cityData = city.default;
}
else{
cityData = city.default;
......
src/pages/cart/cart.wxml
<!--pages/cart/cart.wxml-->
<view class="page-cart" style="padding-bottom:{{currentHeight + 88}}px">
<!-- <view class="open-card">
<view class="vip-desc">
<image class="plus-img" src="/assets/imgs/7_1_0/plus-icon-3x.png" mode="widthFix" />
<text class="vip-info">VIP尊享N大权益，本单立减</text>
<text class="vip-price">￥145</text>
</view>
<view class="open-btn">
<text>去开卡</text>
<image class="arrow-right" mode="widthFix" src="/assets/imgs/7_1_0/small-arrow-right.png" />
</view>
</view> -->
<view class="cart-content" wx:if="{{cartList.length}}">
<!-- 购物车列表 -->
<scroll-del
......@@ -44,7 +33,8 @@
<!-- 空状态时 -->
<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" />
<image class="no-cart-img"
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001236fb5c6-5740-4415-b330-385d951832f0.png" mode="widthFix" />
</view>
<view class="empty-text">亲，您的购物车还空空的哟～</view>
</view>
......
src/pages/confirmOrder/confirmOrder.js
// pages/confirmOrder/confirmOrder.js
const wxService = require('../../utils/wxService')
const app = getApp()
const city = require('../../utils/city')
const hotwindCity = require('../../utils/hotwindCity')
const city = require('../../utils/hotwindCity')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo;
......@@ -387,7 +386,8 @@ wxService.page({
let cityData = [];
//热风地址库特殊处理
if (envInfo.brandId == 2010) {
cityData = hotwindCity.default;
//由于地址框太大了，现在先用热风的一个
cityData = city.default;
}
else {
cityData = city.default;
......@@ -750,7 +750,7 @@ wxService.page({
}
else {
wx.redirectTo({
url: '/subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList',
url: '/oneSubPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList',
});
}
}
......
src/pages/confirmOrder/confirmOrder.wxml
......@@ -120,7 +120,8 @@
<view class="vip-info" wx:if="{{!isVip && plusIsOpen}}">
<view class="vip-left">
<view class="left-top">
<image class="top-image" src="/assets/imgs/7_1_0/plus-icon-3x.png" />
<image class="top-image"
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001a3933408-de10-4029-861f-f8fb5de26092.png" />
<text>现在勾选成为vip，享受更多优惠</text>
</view>
<view class="left-bottom">
......@@ -133,7 +134,7 @@
<image class="check-status-img" src="{{isSelect ? '/assets/imgs/7_1_0/08_22/trade-success.png' : '/assets/imgs/7_1_0/08_22/trade-unsel.png'}}" />
</view>
<view class="right-check-tips {{isSelect? 'tip-check' : 'tip-un-check'}}">
<image class="select-check-open {{isSelect? 'tip-check' : 'tip-un-check'}}" src="{{isSelect ? '/assets/imgs/7_1_0/08_22/sel.png' : '/assets/imgs/7_1_0/08_22/un-sel.png'}}" />
<image class="select-check-open {{isSelect? 'tip-check' : 'tip-un-check'}}" src="{{isSelect ? 'https://img3.bigaka.com/prd/3001/202003/20200309/3001ab6df057-e550-446c-a641-c5dcd8dbb51e.png' : 'https://img3.bigaka.com/prd/3001/202003/20200309/3001e6e3414a-3f8e-4100-b9da-7f852d842235.png'}}" />
</view>
</view>
</view>
......
src/pages/logistics/logistics.wxml
......@@ -2,7 +2,7 @@
<view class="page-logistics" wx:if="{{orderId && hasLogisticInfo}}">
<view class="header-wrap">
<image class="header-bg" src="/assets/imgs/7_1_0/logistics-bg.jpg" />
<image class="header-bg" src="https://img3.bigaka.com/prd/3001/202003/20200309/300106606827-975c-4d80-a176-c1830857107b.jpg" />
<view class="logistics-status">
<view class="status">物流公司：{{logisData.company}}</view>
<view class="desc">物流单号：{{logisData.no}}</view>
......
src/pages/orderDetail/orderDetail.wxml
<wxs src="../../wxs/utils.wxs" module="utils" />
<view class="page-order-detail">
<view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')">
<view class="header-wrap"
style="background-image:url('https://img3.bigaka.com/prd/3001/202003/20200309/3001a46ba5bf-235d-428b-b7bb-befcf37ff89b.jpg')">
<view class="refund-status">
<view
class="look-logistics"
......
src/pages/productDetail/productDetail.wxml
......@@ -55,7 +55,9 @@
</view>
<view class="member-price" wx:if="{{openPlusStatus}}">
<view class="member-price-info">
<image class="member-price-icon" src="/assets/imgs/7_1_0/plus.png" />
<image
class="member-price-icon"
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001fce746fd-c6f9-4016-bc0a-9aee0ac93f7a.png" />
<text class="before-reduce-price">￥{{productInfo.plusPrice ? utils.numberFormat(productInfo.plusPrice / 100) : utils.numberFormat(productInfo.minSalePrice / 100)
}}</text>
<!-- <text class="reduce-price">本次立减￥60</text> -->
......
src/pages/refundDetail/refundDetail.wxml
......@@ -2,7 +2,8 @@
<wxs src="../../wxs/utils.wxs" module="utils" />
<view class="page-refund-detail">
<view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')">
<view class="header-wrap"
style="background-image:url('https://img3.bigaka.com/prd/3001/202003/20200309/3001a46ba5bf-235d-428b-b7bb-befcf37ff89b.jpg')">
<view class="refund-status" wx-if="{{refundDetail.status == 'C'}}">
<view class="status">退货取消</view>
<view class="desc">你已取消退款啦~</view>
......
src/project.config.json
......@@ -43,7 +43,7 @@
"list": []
},
"miniprogram": {
"current": -1,
"current": 65,
"list": [
{
"id": -1,
......@@ -479,10 +479,10 @@
"scene": null
},
{
"id": -1,
"id": 65,
"name": "超值卡列表",
"pathName": "subPackage/page/pages/valueCard/valueCard",
"query": ""
"query": "scene=t%3Dc76v7VGX00"
},
{
"id": 71,
......@@ -518,14 +518,14 @@
"scene": null
},
{
"id": -1,
"id": 71,
"name": "自提订单列表",
"pathName": "subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList",
"query": "",
"scene": null
},
{
"id": 77,
"id": 72,
"name": "自提订单详情",
"pathName": "subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo",
"query": "id=676422376522780672",
......
src/subPackage/page/pages/couponCenter/couponCenter.js
......@@ -73,7 +73,7 @@ wxService.page({
//跳转到详情
goCouponDetail(e) {
const { id } = e.currentTarget.dataset
wxService.router(`/subPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${id}`)
wxService.router(`/oneSubPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${id}`)
},
/**
* 页面相关事件处理函数--监听用户下拉动作
......
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.js
......@@ -76,7 +76,7 @@ wxService.page({
let url = this.data.activityInfo.listPicture ? this.data.activityInfo.listPicture : 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png';
return {
title: `我分享给你一张“${this.data.activityInfo.couponName}”的优惠券，赶快领取吧~`,
path: `/subPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${this.data.activityId}`,
path: `/oneSubPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${this.data.activityId}`,
imageUrl: url, // 可以更换分享的图片
}
}
......
src/subPackage/page/pages/liveVideo/liveVideo.js
......@@ -16,6 +16,7 @@ wxService.page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options)
if (!options.room_id){
wx.showToast({
title: '暂无直播信息~',
......
src/subPackage/page/pages/myValueCard/myValueCard.json
......@@ -2,5 +2,7 @@
"navigationBarTitleText": "我的超值卡",
"backgroundTextStyle": "dark",
"enablePullDownRefresh": true,
"usingComponents": {}
"usingComponents": {
"empty": "../../../../component/empty/empty"
}
}
\ No newline at end of file
src/subPackage/page/pages/myValueCard/myValueCard.wxml
<!--subPackage/page/pages/myValueCard/myValueCard.wxml-->
<view class='my-value-card-list'>
<view class='my-value-card-list' wx:if="{{myCardsList.length > 0}}">
<view class='my-value-card-item'
wx:for="{{myCardsList}}"
wx:for-item="item"
wx:for-index="idx"
wx:key="*this">
<!-- 失效的时候 -->
<!-- <view class='invalide'>
<view class='status-bar'>
<view class='card-status'>已过期</view>
</view>
</view> -->
<view class='card-top-info' bindtap='onTapShowMoreInfo' data-item="{{item}}" data-index="{{idx}}">
<image class='bg-image {{item.isOpen ? "expand" : "unexpand"}}'
src='{{item.backGroundUrl}}'
mode='widthFix'></image>
<!-- 过期时间展示 -->
<!-- <view class='top-left-days'><label>剩{{item.leftTimes}}天</label></view> -->
<view class='card-top-info-desc'>
<label>剩{{item.leftTimes}}次</label>
<label>剩{{item.leftTimes}}次，{{item.leftTimes}}天过期</label>
<image class='qrcode' src='/assets/imgs/711_11.png' mode='aspectFit'></image>
</view>
</view>
......@@ -27,12 +35,14 @@
</view>
</view>
<view class='exp-info'>
<label>使用时间：</label>
<label>有效时间：</label>
<text>{{item.startTime}} 至 {{item.endTime}}</text>
</view>
<view class='exp-info'>
<label style='color:#76A1D5;' data-item="{{item}}" bindtap="onTapToInfoPage">查看详细使用说明</label>
<image data-item="{{item}}" bindtap="onTapToInfoPage" src='/assets/imgs/icon_arrow_right.png' class='arrow-image' mode='aspectFit'></image>
<image data-item="{{item}}" bindtap="onTapToInfoPage"
src='/assets/imgs/icon_arrow_right.png'
class='arrow-image' mode='aspectFit'></image>
<image class='unexpand-icon'
bindtap='onTapCloseExtro'
data-index="{{idx}}"
......@@ -42,6 +52,8 @@
</view>
</view>
</view>
<!-- 空 -->
<empty text="您还未购买任何超值卡~" wx:if="{{myCardsList.length == 0}}"/>
<view class='no-more' wx:if="{{isNoData}}">-- 我也是有底线滴 --</view>
<!-- 底部购买记录 -->
......
src/subPackage/page/pages/myValueCard/myValueCard.wxss
......@@ -21,6 +21,39 @@ view{
width: 100%;
height: auto;
margin-bottom: 20rpx;
position: relative;
}
.my-value-card-list .my-value-card-item .invalide{
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.7);
z-index: 1;
}
.my-value-card-list .my-value-card-item .invalide .status-bar{
width: 100%;
height: 80rpx;
margin-top: 30rpx;
display: flex;
justify-content: flex-end;
align-items: center;
}
.my-value-card-list .my-value-card-item .invalide .status-bar .card-status{
width: 110rpx;
height: 50rpx;
background: #ffffff;
border-top-left-radius: 25rpx;
border-bottom-left-radius: 25rpx;
font-size: 24rpx;
color: #666666;
display: flex;
justify-content: center;
align-items: center;
}
.my-value-card-list .my-value-card-item .card-top-info{
......@@ -29,11 +62,38 @@ view{
position: relative;
}
.my-value-card-list .my-value-card-item .card-top-info .top-left-days{
position: absolute;
top: 20rpx;
width: 100%;
height: 70rpx;
padding: 0 30rpx;
display: flex;
justify-content: flex-start;
align-items: center;
}
.my-value-card-list .my-value-card-item .card-top-info .top-left-days label{
height: 50rpx;
width: auto;
padding: 0 30rpx;
border-radius: 25rpx;
background: #ffffff;
color: #333333;
font-weight: bold;
font-size: 24rpx;
display: flex;
align-items: center;
justify-content: center;
}
.my-value-card-list .my-value-card-item .card-top-info .bg-image{
width: 100%;
display: block;
}
.my-value-card-list .my-value-card-item .card-top-info .bg-image.unexpand{
border-radius: 6rpx;
}
......@@ -174,6 +234,7 @@ view{
display: flex;
justify-content: center;
align-items: center;
z-index: 9;
}
.buy-records:active{
......
src/subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml
<!--subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml-->
<view class='my-card-info'>
<image src='{{valueCardInfo.backGroundUrl}}' mode='widthFix'></image>
<label>剩{{valueCardInfo.leftTimes}}次</label>
<label>剩{{valueCardInfo.leftTimes}}次，{{valueCardInfo.leftTimes}}天过期</label>
</view>
<view class='left-num-container'>
......
src/subPackage/page/pages/paymentStatus/paymentStatus.js
......@@ -99,7 +99,7 @@ wxService.page({
goOrder() {
if(this.data.type == 'selfPickUp'){
wx.redirectTo({
url: '/subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList',
url: '/oneSubPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList',
});
}
else{
......
src/subPackage/page/pages/paymentStatus/paymentStatus.wxml
......@@ -4,7 +4,7 @@
<view class="payment-status">
<image
class="status-img"
src="{{status == 'S' ? '/assets/imgs/7_1_0/08_22/success.png' : '/assets/imgs/7_1_0/08_22/fail.png'}}"
src="{{status == 'S' ? 'https://img3.bigaka.com/prd/3001/202003/20200309/3001b9ce7143-9756-41ee-a386-39afe269a06a.png' : 'https://img3.bigaka.com/prd/3001/202003/20200309/3001278a6ae3-017b-43c7-8c56-900014f74d7a.png'}}"
mode="widthFix"
lazy-load="false"
/>
......
src/subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList.js
......@@ -78,7 +78,7 @@ wxService.page({
onTapToOrderInfo(e){
let item = e.currentTarget.dataset.item;
wx.navigateTo({
url: '/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo?id=' + item.id,
url: '/oneSubPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo?id=' + item.id,
});
},
//立即支付
......
src/subPackage/page/pages/share/share.wxml
......@@ -55,7 +55,8 @@
</view>
<view class="poster-tips">
<image src="/assets/imgs/7_1_0/poster-tips.png" mode="widthFix"></image>
<image src="https://img3.bigaka.com/prd/3001/202003/20200309/3001c489308a-2fa1-483a-b3f1-eb18eb2a64c7.png"
mode="widthFix"></image>
</view>
<!-- 测试 -->
......
src/utils/city.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/utils/wxService.js
......@@ -17,7 +17,7 @@ const Promise = require('../lib/bluebird')
const config = require('../config/index').envInfo
const envInfo = require('../config/index').envInfo
import utils from './util'
const citysData = require('./city.js')
const citysData = require('./hotwindCity.js')
import { Integer } from './integerDigitalConvertion'
import * as watch from "./watch.js";
const pathData = require('./currentAccessiblePath.js')
......@@ -294,7 +294,7 @@ class WXService extends Http {
}
//记录触点统计
// this.markerTentacleInfo(TENTACLE_CONTENT);
this.markerTentacleInfo(TENTACLE_CONTENT);
if (data.status == 1) {
var timestamp = Date.parse(new Date())
......@@ -344,7 +344,7 @@ class WXService extends Http {
wxService.post(`/member/share/inviteFriendsLoginLog/saveBatch`, {
memberId: memberId,
tentacleContent: tentacleContent,
}), then(res => {
}).then(res => {
if (res) {
if (res.data.result == 0) {
//调用接口成功 开始保存
......@@ -704,6 +704,9 @@ class WXService extends Http {
if (idParam.indexOf('pageId') > -1){
item['pageId'] = shareId;
}
if (idParam.indexOf('room_id') > -1){
item['room_id'] = shareId;
}
if (tParam){
id = Integer.digit(tParam, 64, 10);
}
......
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