Browse Source

支付修改

soldDate
HolyKnightIX 2 years ago
parent
commit
1145be18f1
7 changed files with 34 additions and 27 deletions
  1. +4
    -4
      ext.json
  2. +11
    -11
      index/index.ttml
  3. +2
    -2
      index/user.ttml
  4. +1
    -3
      pages/coupon/confirmation/confirmation.js
  5. +3
    -2
      pages/coupon/detail/index.ttml
  6. +1
    -3
      pages/order/detail/index.js
  7. +12
    -2
      project.config.json

+ 4
- 4
ext.json View File

@@ -1,17 +1,17 @@
{ {
"ext": { "ext": {
"attr": { "attr": {
"configUrl": "https://c.malls.iformall.com/C/api"
"configUrl": "https://ctest.malls.iformall.com/C/api"
}, },
"name": "精选常德",
"weappId": "tt1e4668fb8178581401"
"name": "福喵",
"weappId": "tt620e14b3fd30264101"
}, },
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#fff" "navigationBarBackgroundColor": "#fff"
}, },
"extAppid": "tt1e4668fb8178581401",
"extAppid": "tt620e14b3fd30264101",
"extEnable": true, "extEnable": true,
"directCommit": false, "directCommit": false,
"networkTimeout": { "networkTimeout": {


+ 11
- 11
index/index.ttml View File

@@ -97,7 +97,7 @@
<c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}" <c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}"
loading="{{loading}}" /> loading="{{loading}}" />
<!-- 广告蒙层 --> <!-- 广告蒙层 -->
<c-advertisement id="advertisement" tt:if="{{showGg&&!played&&!havePlayEd1}}" ggdata="{{ggdata}}" />
<!-- <c-advertisement id="advertisement" tt:if="{{showGg&&!played&&!havePlayEd1}}" ggdata="{{ggdata}}" /> -->
</view> </view>
<!-- 顶部签到成长值 --> <!-- 顶部签到成长值 -->
<view class='signin' tt:if="{{fistLogin}}" animation="{{alphaData}}"> <view class='signin' tt:if="{{fistLogin}}" animation="{{alphaData}}">
@@ -171,19 +171,19 @@




<!-- 限时抢购 --> <!-- 限时抢购 -->
<c-mould tt:if="{{topicObj2}}" obj="{{topicObj2}}" isShowCount
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_xsqw.png" />
<!-- <c-mould tt:if="{{topicObj2}}" obj="{{topicObj2}}" isShowCount
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_xsqw.png" /> -->
<!-- 砍价 --> <!-- 砍价 -->
<c-mould tt:if="{{topicObj3}}" obj="{{topicObj3}}"
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_kj.png" />
<!-- <c-mould tt:if="{{topicObj3}}" obj="{{topicObj3}}"
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_kj.png" /> -->
<!-- 拼团 --> <!-- 拼团 -->
<c-mould tt:if="{{topicObj4}}" obj="{{topicObj4}}"
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_pt.png" />
<!-- <c-mould tt:if="{{topicObj4}}" obj="{{topicObj4}}"
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_pt.png" /> -->
<!-- 专题 --> <!-- 专题 -->
<c-mould tt:if="{{specialLsit.length>0}}" tt:for="{{specialLsit}}" tt:key="{{index}}" obj="{{item}}" special />
<!-- <c-mould tt:if="{{specialLsit.length>0}}" tt:for="{{specialLsit}}" tt:key="{{index}}" obj="{{item}}" special /> -->
<!-- 消费卡 --> <!-- 消费卡 -->
<c-mould tt:if="{{topicObj5}}" obj="{{topicObj5}}"
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_xfk.png" />
<!-- <c-mould tt:if="{{topicObj5}}" obj="{{topicObj5}}"
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_xfk.png" /> -->
<!-- 积分商城 --> <!-- 积分商城 -->
<c-mould tt:if="{{topicObj6}}" obj="{{topicObj6}}" <c-mould tt:if="{{topicObj6}}" obj="{{topicObj6}}"
titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_jfsc.png" /> titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_jfsc.png" />
@@ -195,7 +195,7 @@
<!-- <c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}" loading="{{loading}}" /> --> <!-- <c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}" loading="{{loading}}" /> -->


<!-- 广告蒙层 --> <!-- 广告蒙层 -->
<c-advertisement id="advertisement" tt:if="{{showGg&&!played&&!havePlayEd1}}" ggdata="{{ggdata}}" />
<!-- <c-advertisement id="advertisement" tt:if="{{showGg&&!played&&!havePlayEd1}}" ggdata="{{ggdata}}" /> -->
</view> </view>
<!-- 顶部签到成长值 --> <!-- 顶部签到成长值 -->
<view class='signin' tt:if="{{fistLogin}}" animation="{{alphaData}}"> <view class='signin' tt:if="{{fistLogin}}" animation="{{alphaData}}">


+ 2
- 2
index/user.ttml View File

@@ -46,12 +46,12 @@
<view class="fuwuName">投诉建议</view> <view class="fuwuName">投诉建议</view>
</view> --> </view> -->
<navigator class="fuwuItem" url="/pages/questionnaire/questionnaireLsit/questionnaireLsit" hover-class="navigator-hover" open-type="navigate">
<!-- <navigator class="fuwuItem" url="/pages/questionnaire/questionnaireLsit/questionnaireLsit" hover-class="navigator-hover" open-type="navigate">
<view class="fuwuLogoBox f" > <view class="fuwuLogoBox f" >
<image class="itemLogo" src="../assets/images/wenquan.png" /> <image class="itemLogo" src="../assets/images/wenquan.png" />
</view> </view>
<view class="fuwuName f">问卷调查</view> <view class="fuwuName f">问卷调查</view>
</navigator>
</navigator> -->
<navigator class="fuwuItem" url="/pages/mallInfo/mallInfo" hover-class="navigator-hover" open-type="navigate"> <navigator class="fuwuItem" url="/pages/mallInfo/mallInfo" hover-class="navigator-hover" open-type="navigate">
<view class="fuwuLogoBox f" > <view class="fuwuLogoBox f" >
<image class="itemLogo" src="../assets/images/mian1.png" /> <image class="itemLogo" src="../assets/images/mian1.png" />


+ 1
- 3
pages/coupon/confirmation/confirmation.js View File

@@ -488,9 +488,7 @@ Page({
} }
}).then(res => { }).then(res => {
console.log(res,"789789"); console.log(res,"789789");
let tempCallbackData = {
composeOrderId:res.data.outOrderNo
}
let tempCallbackData = res.data.callbackData
// tempCallbackData[that.data.data.couponChannel.ttSpuId] = that.data.data.couponChannel.id // tempCallbackData[that.data.data.couponChannel.ttSpuId] = that.data.data.couponChannel.id
let options = { let options = {
callbackData: tempCallbackData, callbackData: tempCallbackData,


+ 3
- 2
pages/coupon/detail/index.ttml View File

@@ -107,6 +107,7 @@
<view class="childMoney">¥{{item.priceStr}}</view> <view class="childMoney">¥{{item.priceStr}}</view>
</view> </view>
</view> </view>
<vieW class="groupTitleBox"> <vieW class="groupTitleBox">
<view class="groupTitle" tt:if="{{data.itemGroup.length>0}}">餐饮搭配</view> <view class="groupTitle" tt:if="{{data.itemGroup.length>0}}">餐饮搭配</view>
<view class="groupTitle" tt:if="{{data.Description.length>0}}">商品描述</view> <view class="groupTitle" tt:if="{{data.Description.length>0}}">商品描述</view>
@@ -344,11 +345,11 @@
</view> </view>
</view> </view>
</view> </view>
<view class="shootBox" tt:if="{{spuIdObj.lastStatus==4}}">
<!-- <view class="shootBox" tt:if="{{spuIdObj.lastStatus==4}}">
<button class="mount" open-type="share" data-channel="video"> <button class="mount" open-type="share" data-channel="video">
<image src="../../../assets/images/shoot.png" class="videoCla"/> <image src="../../../assets/images/shoot.png" class="videoCla"/>
<view class="issue">发布视频</view> <view class="issue">发布视频</view>
</button> </button>
</view>
</view> -->
<phoen showBox="{{showBox}}" bind:hiePhoen="setPhone" bind:heiBox="setBox" /> <phoen showBox="{{showBox}}" bind:hiePhoen="setPhone" bind:heiBox="setBox" />
</view> </view>

+ 1
- 3
pages/order/detail/index.js View File

@@ -731,9 +731,7 @@ Page({
} }
}).then(res => { }).then(res => {
if (res.data.createPay) { if (res.data.createPay) {
let tempCallbackData = {
composeOrderId: res.data.outOrderNo
}
let tempCallbackData = res.data.callbackData
// tempCallbackData[that.data.data.couponChannel.ttSpuId] = that.data.data.couponChannel.id // tempCallbackData[that.data.data.couponChannel.ttSpuId] = that.data.data.couponChannel.id
let options = { let options = {
callbackData: tempCallbackData, callbackData: tempCallbackData,


+ 12
- 2
project.config.json View File

@@ -10,7 +10,8 @@
"scripts": false, "scripts": false,
"mockLogin": false, "mockLogin": false,
"autoCompile": true, "autoCompile": true,
"localPlugins": false
"localPlugins": false,
"IDEPreviewHotRestartCache": false
}, },
"appid": "ttde7ca8c141425a2301", "appid": "ttde7ca8c141425a2301",
"projectname": "tt富茂C", "projectname": "tt富茂C",
@@ -44,8 +45,17 @@
"scene": "990001", "scene": "990001",
"launchFrom": "scan", "launchFrom": "scan",
"location": "qr_code" "location": "qr_code"
},
{
"id": 1665480010958,
"name": "pages/coupon/detail/index",
"pathName": "pages/coupon/detail/index",
"query": "",
"scene": "",
"launchFrom": "",
"location": ""
} }
] ]
} }
} }
}
}

Loading…
Cancel
Save