Browse Source

修改路径

feature/v1.1.0
shuiqing 7 years ago
parent
commit
cefa435309
9 changed files with 25 additions and 24 deletions
  1. 2
      app.js
  2. 26
      pages/activity_detail/activity_detail.js
  3. 5
      pages/activity_detail/activity_detail.wxml
  4. 1
      pages/activity_list/activity_list.js
  5. 4
      pages/index/index.js
  6. 2
      pages/login/login.js
  7. 4
      pages/login/login.wxml
  8. 2
      project.config.json
  9. 3
      wxParse/wxParse.wxml

2
app.js

@ -1,7 +1,7 @@
//app.js
App({
gw: {
hostUrl: 'https://www.1hjz.cn',
hostUrl: 'https://test.1hjz.cn',
mapUrl:'https://api.map.baidu.com',
systemInfo : null,//系统信息
},

26
pages/activity_detail/activity_detail.js

@ -72,8 +72,8 @@ Page({
var url = "";
var data = {};
if (that.data.groupNo != "") {
url = "/mall/wxa/activity/group/detail";
} else {
url = "/mall/wxa/activity/group/detail";//接口
} else {
url = "/mall/wxa/activity/detail";
}
wx.request({
@ -243,7 +243,7 @@ Page({
interval = setInterval(function () {
// 秒数
var second = totalSecond;
// 天数位
// 天数位
var day = Math.floor(second / 3600 / 24);
var dayStr = day.toString();
if (dayStr.length == 1) dayStr = '0' + dayStr;
@ -267,20 +267,20 @@ Page({
countDownSecond: secStr,
});
totalSecond--;
if (totalSecond < 0) {
if (totalSecond < 0) {//活动结束时
this.stopInterval();
this.getActivityDetail();
}
}.bind(this), 1000);
},
// 图片加载
ruleImageLoad: function (image) {
ruleImageLoad: function (image) {//拼团失败时的图片加载
var imageHeight = getApp().gw.systemInfo.windowWidth / image.detail.width * image.detail.height;
this.setData({
rule_image_height: imageHeight
})
},
detailImageLoad: function (image) {
detailImageLoad: function (image) {//暂时不清楚是做什么的
var imageHeight = getApp().gw.systemInfo.windowWidth / image.detail.width * image.detail.height;
this.setData({
detail_image_height: imageHeight
@ -377,12 +377,12 @@ Page({
let dr = data.response.weixinTransParameters;
console.log(dr);
wx.requestPayment({//微信支付
"timeStamp": dr.timeStamp,
"nonceStr": dr.nonceStr,
"package": dr.package,
"signType": dr.signType,
"paySign": dr.paySign,
"success": function (res) {
"timeStamp": dr.timeStamp,//时间戳
"nonceStr": dr.nonceStr,//随机字符串
"package": dr.package,//单接口返回的prepay_id参数值
"signType": dr.signType,//签名算法
"paySign": dr.paySign,//签名
"success": function (res) {//成功时回调
console.log(res);
wx.showToast({
title: '支付成功',
@ -394,7 +394,7 @@ Page({
url: '../pay_result/pay_result?activityNo=' + that.data.activityNo + '&groupNo=' + that.data.groupNo + '&shareTitle=' + that.data.activityDetail.shareTitle + '&sharePhoto=' + that.data.activityDetail.sharePhoto
})
},
"fail": function (res) {
"fail": function (res) {//接口调用失败的回调
console.log(res);
if (res.errMsg == 'requestPayment:fail cancel') {
wx.showToast({

5
pages/activity_detail/activity_detail.wxml

@ -77,14 +77,15 @@
<template is="wxParse" data="{{wxParseData:activityContent.nodes}}" />
</view>
</scroll-view>
<view class='bottom_view'>
<view class='bottom_view'>
<!-- 我要开团按钮 -->
<view class='one_content' id='one_button' style='display: {{one_content}};background-color:{{bottomBGColor}};' bindtap='groupTap'>{{buttomText}}</view>
<view class='two_content' id='two_content' style='display: {{two_content}};'>
<!-- 参与拼团的成员---左边价格,右边参与拼团 -->
<view class='left'>¥{{activityDetail.participantPrice / 100}}</view>
<view class='right' bindtap='groupTap'>{{buttomText}}</view>
</view>
</view>
</view>
<!--底部弹出框-->
<zan-actionsheet show="{{ show }}" actions="{{ actions }}" cancel-with-mask="{{ cancelWithMask }}" bind:cancel="closeActionSheet" bind:actionclick="clickAction" mask-class="tiny" />

1
pages/activity_list/activity_list.js

@ -1,4 +1,5 @@
// pages/activity_list/activity_list.js
// 引用数据请求的 公共函数
const util = require('../../utils/util.js')
Page({

4
pages/index/index.js

@ -40,7 +40,7 @@ Page({
this.getActivityList();
},
/**
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let that = this;
@ -87,7 +87,7 @@ Page({
wx.request({
url: app.gw.hostUrl + '/mall/wxa/activity/list',
method: 'get',
data: {
data: {
merchantNo: 'SH180331153109966163',
// selectedCityId: that.data.addrArray.id[that.data.addrIndex] == undefined ? 0 : that.data.addrArray.id[that.data.addrIndex],
pageNum: that.data.pageNum,

2
pages/login/login.js

@ -11,7 +11,7 @@ Page({
mobile_count:60,
isLogin:false
},
//事件处理函数
//事件处理函数
inputMobile:function(e){//输入手机号事件监听
this.setData({
mobile: e.detail.value

4
pages/login/login.wxml

@ -10,7 +10,7 @@
</view>
<view class='line'></view>
<view class='box'>
<view class='text'>动态码:</view>
<view class='text'>动态码:</view>
<view class='icon-note'>
<view class='note code-note'>
<input class='note' name="code" placeholder='短信动态码' bindinput='inputCode'/>
@ -20,4 +20,4 @@
</view>
</view>
<button class='subBtn' form-type="submit" open-type='getUserInfo' bindtap='bindFormSubmit'> 登录 </button>
</form>
</form>

2
project.config.json

@ -10,7 +10,7 @@
"compileType": "miniprogram",
"appid": "wx2c28390f4f2c0888",
"libVersion": "2.0.9",
"projectname": "%E5%AE%B6%E6%94%BF%E5%B0%8F%E7%A8%8B%E5%BA%8F%EF%BC%88%E4%BA%8C%E5%8F%B7%EF%BC%89",
"projectname": "%E4%BA%8C%E5%8F%B7%E5%AE%B6%E6%94%BF%EF%BC%88%E4%BA%8C%E5%8F%B7%EF%BC%89",
"condition": {
"search": {
"current": -1,

3
wxParse/wxParse.wxml

@ -18,8 +18,7 @@
</template>
<template name="wxParseImg">
<image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style="width:{{item.width}}px;"
/>
<image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style="width:{{item.width}}px;" />
</template>
<template name="WxEmojiView">

Loading…
Cancel
Save