Commit 7abaf81c authored by qipeng's avatar qipeng

Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

parents 8c56eafc fe377f00
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
"path": "pages/combination/combiChoose/combiChoose", "path": "pages/combination/combiChoose/combiChoose",
"style": { "style": {
"navigationBarTitleText": "产品选择", "navigationBarTitleText": "产品选择",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, },
......
...@@ -314,10 +314,8 @@ ...@@ -314,10 +314,8 @@
<view class="bottom"> <view class="bottom">
<view class="bottom-left"> <view class="bottom-left">
<text> ¥{{ originalTotal || 0 }} </text> <text> ¥{{ originalTotal || 0 }} </text>
<text> <text>¥</text>{{ sellTotal || 0 }} </text> <text> <text>¥</text>{{ sellTotal || 0 }} </text>
</view> </view>
<view class="bottom-right"> <view class="bottom-right">
<view @click="showDetail()" class="bottom-detail"> <view @click="showDetail()" class="bottom-detail">
明细 明细
......
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