huangshijie/hios-miniprogram
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、删除一些无效css代码

Browse Source 
2、解决wx:key的warinng
3、删除无用的函数
4、取消订单时停止定时器
5、针对订单操作后，返回订单列表没有刷新的问题，添加一个标志（不过不是最好的办法，暂时这样吧）
6、修复再来一单，提交一次后，再返回再提交时出现订单不存在的bug
This commit is contained in:
shengliang 2020-02-29 10:45:24 +08:00
parent 63c771e1c2
commit 32f71cd1cc
16 changed files with 159 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
lib/wxParse/wxParse.wxml
View File

@ -24,7 +24,7 @@
<template name="WxEmojiView"> <template name="WxEmojiView">
<view class="WxEmojiView wxParse-inline" style="{{item.styleStr}}"> <view class="WxEmojiView wxParse-inline" style="{{item.styleStr}}">
<block wx:for="{{item.textArray}}" wx:key=""> <block wx:for="{{item.textArray}}" wx:key="id">
<block class="{{item.text == '\\n' ? 'wxParse-hide':''}}" wx:if="{{item.node == 'text'}}">{{item.text}}</block> <block class="{{item.text == '\\n' ? 'wxParse-hide':''}}" wx:if="{{item.node == 'text'}}">{{item.text}}</block>
<block wx:elif="{{item.node == 'element'}}"> <block wx:elif="{{item.node == 'element'}}">
<image class="wxEmoji" src="{{item.baseSrc}}{{item.text}}" /> <image class="wxEmoji" src="{{item.baseSrc}}{{item.text}}" />
@ -36,7 +36,7 @@
<!--入口模版--> <!--入口模版-->
<template name="wxParse"> <template name="wxParse">
<block wx:for="{{wxParseData}}" wx:key=""> <block wx:for="{{wxParseData}}" wx:key="id">
<template is="wxParse0" data="{{item}}"/> <template is="wxParse0" data="{{item}}"/>
</block> </block>
</template> </template>
@ -49,7 +49,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse1" data="{{item}}"/> <template is="wxParse1" data="{{item}}"/>
</block> </block>
</button> </button>
@ -62,7 +62,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse1" data="{{item}}"/> <template is="wxParse1" data="{{item}}"/>
</block> </block>
</view> </view>
@ -83,14 +83,14 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-c="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-c="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse1" data="{{item}}"/> <template is="wxParse1" data="{{item}}"/>
</block> </block>
</view> </view>
</block> </block>
<block wx:elif="{{item.tag == 'table'}}"> <block wx:elif="{{item.tag == 'table'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse1" data="{{item}}"/> <template is="wxParse1" data="{{item}}"/>
</block> </block>
</view> </view>
@ -99,7 +99,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse1" data="{{item}}"/> <template is="wxParse1" data="{{item}}"/>
</block> </block>
</view> </view>
@ -107,7 +107,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse1" data="{{item}}"/> <template is="wxParse1" data="{{item}}"/>
</block> </block>
</view> </view>
@ -131,7 +131,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse2" data="{{item}}"/> <template is="wxParse2" data="{{item}}"/>
</block> </block>
</button> </button>
@ -144,7 +144,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse2" data="{{item}}"/> <template is="wxParse2" data="{{item}}"/>
</block> </block>
</view> </view>
@ -165,7 +165,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse2" data="{{item}}"/> <template is="wxParse2" data="{{item}}"/>
</block> </block>
</view> </view>
@ -174,7 +174,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse2" data="{{item}}"/> <template is="wxParse2" data="{{item}}"/>
</block> </block>
</view> </view>
@ -182,7 +182,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse2" data="{{item}}"/> <template is="wxParse2" data="{{item}}"/>
</block> </block>
</view> </view>
@ -205,7 +205,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse3" data="{{item}}"/> <template is="wxParse3" data="{{item}}"/>
</block> </block>
</button> </button>
@ -218,7 +218,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse3" data="{{item}}"/> <template is="wxParse3" data="{{item}}"/>
</block> </block>
</view> </view>
@ -239,7 +239,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse3" data="{{item}}"/> <template is="wxParse3" data="{{item}}"/>
</block> </block>
</view> </view>
@ -248,7 +248,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse3" data="{{item}}"/> <template is="wxParse3" data="{{item}}"/>
</block> </block>
</view> </view>
@ -256,7 +256,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse3" data="{{item}}"/> <template is="wxParse3" data="{{item}}"/>
</block> </block>
</view> </view>
@ -278,7 +278,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse4" data="{{item}}"/> <template is="wxParse4" data="{{item}}"/>
</block> </block>
</button> </button>
@ -291,7 +291,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse4" data="{{item}}"/> <template is="wxParse4" data="{{item}}"/>
</block> </block>
</view> </view>
@ -312,7 +312,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse4" data="{{item}}"/> <template is="wxParse4" data="{{item}}"/>
</block> </block>
</view> </view>
@ -321,7 +321,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse4" data="{{item}}"/> <template is="wxParse4" data="{{item}}"/>
</block> </block>
</view> </view>
@ -329,7 +329,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse4" data="{{item}}"/> <template is="wxParse4" data="{{item}}"/>
</block> </block>
</view> </view>
@ -351,7 +351,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse5" data="{{item}}"/> <template is="wxParse5" data="{{item}}"/>
</block> </block>
</button> </button>
@ -364,7 +364,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse5" data="{{item}}"/> <template is="wxParse5" data="{{item}}"/>
</block> </block>
</view> </view>
@ -385,7 +385,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse5" data="{{item}}"/> <template is="wxParse5" data="{{item}}"/>
</block> </block>
</view> </view>
@ -394,7 +394,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse5" data="{{item}}"/> <template is="wxParse5" data="{{item}}"/>
</block> </block>
</view> </view>
@ -402,7 +402,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse5" data="{{item}}"/> <template is="wxParse5" data="{{item}}"/>
</block> </block>
</view> </view>
@ -424,7 +424,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse6" data="{{item}}"/> <template is="wxParse6" data="{{item}}"/>
</block> </block>
</button> </button>
@ -437,7 +437,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse6" data="{{item}}"/> <template is="wxParse6" data="{{item}}"/>
</block> </block>
</view> </view>
@ -458,7 +458,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse6" data="{{item}}"/> <template is="wxParse6" data="{{item}}"/>
</block> </block>
</view> </view>
@ -467,7 +467,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse6" data="{{item}}"/> <template is="wxParse6" data="{{item}}"/>
</block> </block>
</view> </view>
@ -475,7 +475,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse6" data="{{item}}"/> <template is="wxParse6" data="{{item}}"/>
</block> </block>
</view> </view>
@ -497,7 +497,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse7" data="{{item}}"/> <template is="wxParse7" data="{{item}}"/>
</block> </block>
</button> </button>
@ -510,7 +510,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse7" data="{{item}}"/> <template is="wxParse7" data="{{item}}"/>
</block> </block>
</view> </view>
@ -531,7 +531,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse7" data="{{item}}"/> <template is="wxParse7" data="{{item}}"/>
</block> </block>
</view> </view>
@ -540,7 +540,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse7" data="{{item}}"/> <template is="wxParse7" data="{{item}}"/>
</block> </block>
</view> </view>
@ -548,7 +548,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse7" data="{{item}}"/> <template is="wxParse7" data="{{item}}"/>
</block> </block>
</view> </view>
@ -569,7 +569,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse8" data="{{item}}"/> <template is="wxParse8" data="{{item}}"/>
</block> </block>
</button> </button>
@ -582,7 +582,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse8" data="{{item}}"/> <template is="wxParse8" data="{{item}}"/>
</block> </block>
</view> </view>
@ -603,7 +603,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse8" data="{{item}}"/> <template is="wxParse8" data="{{item}}"/>
</block> </block>
</view> </view>
@ -612,7 +612,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse8" data="{{item}}"/> <template is="wxParse8" data="{{item}}"/>
</block> </block>
</view> </view>
@ -620,7 +620,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse8" data="{{item}}"/> <template is="wxParse8" data="{{item}}"/>
</block> </block>
</view> </view>
@ -642,7 +642,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse9" data="{{item}}"/> <template is="wxParse9" data="{{item}}"/>
</block> </block>
</button> </button>
@ -655,7 +655,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse9" data="{{item}}"/> <template is="wxParse9" data="{{item}}"/>
</block> </block>
</view> </view>
@ -676,7 +676,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse9" data="{{item}}"/> <template is="wxParse9" data="{{item}}"/>
</block> </block>
</view> </view>
@ -685,7 +685,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse9" data="{{item}}"/> <template is="wxParse9" data="{{item}}"/>
</block> </block>
</view> </view>
@ -693,7 +693,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse9" data="{{item}}"/> <template is="wxParse9" data="{{item}}"/>
</block> </block>
</view> </view>
@ -715,7 +715,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse10" data="{{item}}"/> <template is="wxParse10" data="{{item}}"/>
</block> </block>
</button> </button>
@ -728,7 +728,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse10" data="{{item}}"/> <template is="wxParse10" data="{{item}}"/>
</block> </block>
</view> </view>
@ -749,7 +749,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse10" data="{{item}}"/> <template is="wxParse10" data="{{item}}"/>
</block> </block>
</view> </view>
@ -758,7 +758,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse10" data="{{item}}"/> <template is="wxParse10" data="{{item}}"/>
</block> </block>
</view> </view>
@ -766,7 +766,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse10" data="{{item}}"/> <template is="wxParse10" data="{{item}}"/>
</block> </block>
</view> </view>
@ -788,7 +788,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse11" data="{{item}}"/> <template is="wxParse11" data="{{item}}"/>
</block> </block>
</button> </button>
@ -801,7 +801,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse11" data="{{item}}"/> <template is="wxParse11" data="{{item}}"/>
</block> </block>
</view> </view>
@ -822,7 +822,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse11" data="{{item}}"/> <template is="wxParse11" data="{{item}}"/>
</block> </block>
</view> </view>
@ -831,7 +831,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse11" data="{{item}}"/> <template is="wxParse11" data="{{item}}"/>
</block> </block>
</view> </view>
@ -839,7 +839,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse11" data="{{item}}"/> <template is="wxParse11" data="{{item}}"/>
</block> </block>
</view> </view>
@ -861,7 +861,7 @@
<block wx:if="{{item.node == 'element'}}"> <block wx:if="{{item.node == 'element'}}">
<block wx:if="{{item.tag == 'button'}}"> <block wx:if="{{item.tag == 'button'}}">
<button type="default" size="mini" > <button type="default" size="mini" >
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse12" data="{{item}}"/> <template is="wxParse12" data="{{item}}"/>
</block> </block>
</button> </button>
@ -874,7 +874,7 @@
<view class="{{item.classStr}} wxParse-li-circle"></view> <view class="{{item.classStr}} wxParse-li-circle"></view>
</view> </view>
<view class="{{item.classStr}} wxParse-li-text"> <view class="{{item.classStr}} wxParse-li-text">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse12" data="{{item}}"/> <template is="wxParse12" data="{{item}}"/>
</block> </block>
</view> </view>
@ -895,7 +895,7 @@
<!--a类型--> <!--a类型-->
<block wx:elif="{{item.tag == 'a'}}"> <block wx:elif="{{item.tag == 'a'}}">
<view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}"> <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse12" data="{{item}}"/> <template is="wxParse12" data="{{item}}"/>
</block> </block>
</view> </view>
@ -904,7 +904,7 @@
<!--其他块级标签--> <!--其他块级标签-->
<block wx:elif="{{item.tagType == 'block'}}"> <block wx:elif="{{item.tagType == 'block'}}">
<view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}"> <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse12" data="{{item}}"/> <template is="wxParse12" data="{{item}}"/>
</block> </block>
</view> </view>
@ -912,7 +912,7 @@
<!--内联标签--> <!--内联标签-->
<view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}"> <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
<block wx:for="{{item.nodes}}" wx:for-item="item" wx:key=""> <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="id">
<template is="wxParse12" data="{{item}}"/> <template is="wxParse12" data="{{item}}"/>
</block> </block>
</view> </view>

2
pages/cart/cart.wxml
View File

@ -1,6 +1,6 @@
<view class='container'> <view class='container'>
<view class="goodsList" wx:if="{{cartGoods.length > 0}}"> <view class="goodsList" wx:if="{{cartGoods.length > 0}}">
<view class="a-goods {{item.isTouchMove ? 'touch-move-active' : ''}}" wx:for="{{cartGoods}}" wx:key="{{item.id}}" bindtouchstart="touchstart" bindtouchmove="touchmove" data-index="{{index}}"> <view class="a-goods {{item.isTouchMove ? 'touch-move-active' : ''}}" wx:for="{{cartGoods}}" wx:key="id" bindtouchstart="touchstart" bindtouchmove="touchmove" data-index="{{index}}">
<view class='content'> <view class='content'>
<view wx:if="{{item.number >0 && item.is_on_sale == 1}}" class="checkbox {{item.checked ? 'checked' : ''}}" bindtap="checkedItem" data-item-index="{{index}}"></view> <view wx:if="{{item.number >0 && item.is_on_sale == 1}}" class="checkbox {{item.checked ? 'checked' : ''}}" bindtap="checkedItem" data-item-index="{{index}}"></view>
<view wx:else class="checkbox"></view> <view wx:else class="checkbox"></view>

4
pages/category/index.wxml
View File

@ -8,7 +8,7 @@
<view class="catalog"> <view class="catalog">
<scroll-view class="nav" scroll-y="true"> <scroll-view class="nav" scroll-y="true">
<view class="item {{ nowId == 0 ?'active' : ''}}" bindtap="switchCate" data-id="0">全部</view> <view class="item {{ nowId == 0 ?'active' : ''}}" bindtap="switchCate" data-id="0">全部</view>
<view class="item {{ nowId == item.id?'active' : ''}}" wx:for="{{navList}}" wx:key="{{item.id}}" data-id="{{item.id}}" bindtap="switchCate">{{item.name}}</view> <view class="item {{ nowId == item.id?'active' : ''}}" wx:for="{{navList}}" wx:key="id" data-id="{{item.id}}" bindtap="switchCate">{{item.name}}</view>
</scroll-view> </scroll-view>
<scroll-view class="cate" scroll-y="true" bindscrolltolower="onBottom"> <scroll-view class="cate" scroll-y="true" bindscrolltolower="onBottom">
<block wx:if="{{loading == 0}}"> <block wx:if="{{loading == 0}}">
@ -19,7 +19,7 @@
<view class="text" style="height:{{currentCategory.p_height}}rpx;line-height:{{currentCategory.p_height}}rpx;">{{currentCategory.name}}</view> <view class="text" style="height:{{currentCategory.p_height}}rpx;line-height:{{currentCategory.p_height}}rpx;">{{currentCategory.name}}</view>
</view> </view>
<view class='list-wrap clearfix'> <view class='list-wrap clearfix'>
<view class="goods-box {{(index+1)%2 == 0?'no-margin':''}}" wx:for="{{list}}" wx:for-index="index" wx:for-item="item" wx:key="{{item.id}}"> <view class="goods-box {{(index+1)%2 == 0?'no-margin':''}}" wx:for="{{list}}" wx:for-index="index" wx:for-item="item" wx:key="id">
<navigator hover-class='none' class='navi-url' url="/pages/goods/goods?id={{item.id}}"> <navigator hover-class='none' class='navi-url' url="/pages/goods/goods?id={{item.id}}">
<view class="box"> <view class="box">
<image src="{{item.list_pic_url}}" class="image"> <image src="{{item.list_pic_url}}" class="image">

4
pages/goods/goods.wxml
View File

@ -14,7 +14,7 @@
</view> </view>
<block wx:if="{{gallery.length > 0}}"> <block wx:if="{{gallery.length > 0}}">
<swiper bindchange="bindchange" class="banner banner-style1" indicator-dots="{{false}}" autoplay="{{false}}" current="{{current}}" circular="{{true}}" interval="4000" duration="1000" display-multiple-items="1"> <swiper bindchange="bindchange" class="banner banner-style1" indicator-dots="{{false}}" autoplay="{{false}}" current="{{current}}" circular="{{true}}" interval="4000" duration="1000" display-multiple-items="1">
<swiper-item class="item" wx:for="{{gallery}}" wx:key="{{item.id}}"> <swiper-item class="item" wx:for="{{gallery}}" wx:key="id">
<image bindtap="previewImage" data-src="{{item.img_url}}" src="{{item.img_url}}" class="slide-image" mode="aspectFill" /> <image bindtap="previewImage" data-src="{{item.img_url}}" src="{{item.img_url}}" class="slide-image" mode="aspectFill" />
</swiper-item> </swiper-item>
</swiper> </swiper>
@ -92,7 +92,7 @@
<view class='spec-item'> <view class='spec-item'>
<view class='name'>{{specificationList.name}}</view> <view class='name'>{{specificationList.name}}</view>
<view class="values"> <view class="values">
<view class="value {{item.checked ? 'selected' : ''}} {{item.goods_number <=0?'out-stock':''}}" bindtap="clickSkuValue" wx:for="{{specificationList.valueList}}" wx:key="{{item.id}}" data-value-id="{{item.id}}" data-index="{{index}}" data-name-id="{{item.specification_id}}">{{item.value}}</view> <view class="value {{item.checked ? 'selected' : ''}} {{item.goods_number <=0?'out-stock':''}}" bindtap="clickSkuValue" wx:for="{{specificationList.valueList}}" wx:key="id" data-value-id="{{item.id}}" data-index="{{index}}" data-name-id="{{item.specification_id}}">{{item.value}}</view>
</view> </view>
</view> </view>
<view class="number-item"> <view class="number-item">

14
pages/index/index.wxml
View File

@ -10,8 +10,8 @@
<text class="txt">搜索, 共{{goodsCount}}款好物</text> <text class="txt">搜索, 共{{goodsCount}}款好物</text>
</view> </view>
<view class='banner-wrap' wx:if="{{show_banner && banner.length > 0}}"> <view class='banner-wrap' wx:if="{{show_banner && banner.length > 0}}">
<swiper class="banner" indicator-dots="true" autoplay="{{false}}" interval="3000" duration="1000"> <swiper class="banner" indicator-dots="true" autoplay="{{false}}" interval="3000" duration="1000" >
<swiper-item wx:for="{{banner}}" wx:key="{{item.id}}"> <swiper-item wx:for="{{banner}}" wx:key="id">
<navigator wx:if="{{item.link_type == 0}}" url="/pages/goods/goods?id={{item.goods_id}}"> <navigator wx:if="{{item.link_type == 0}}" url="/pages/goods/goods?id={{item.goods_id}}">
<image src="{{item.image_url}}" background-size="cover"></image> <image src="{{item.image_url}}" background-size="cover"></image>
</navigator> </navigator>
@ -23,7 +23,7 @@
</view> </view>
<view class='marquee_box' wx:if="{{notice.length>0 && show_notice == 1}}"> <view class='marquee_box' wx:if="{{notice.length>0 && show_notice == 1}}">
<swiper vertical="{{true}}" class="notice-swiper" indicator-dots="{{false}}" autoplay="{{true}}" interval="2000" duration="1000"> <swiper vertical="{{true}}" class="notice-swiper" indicator-dots="{{false}}" autoplay="{{true}}" interval="2000" duration="1000">
<swiper-item wx:for="{{notice}}" wx:key="{{item.id}}" class='notice-wrap'> <swiper-item wx:for="{{notice}}" wx:key="id" class='notice-wrap'>
<view class="icon"> <view class="icon">
<image src="http://lucky-icon.meiweiyuxian.com/hio/notice-icon.png" class='img'> <image src="http://lucky-icon.meiweiyuxian.com/hio/notice-icon.png" class='img'>
@ -36,13 +36,13 @@
</view> </view>
<swiper class="catalog-wrap" indicator-dots="{{false}}" indicator-color="#dedede" indicator-active-color="#e00000" wx:if="{{show_channel}}"> <swiper class="catalog-wrap" indicator-dots="{{false}}" indicator-color="#dedede" indicator-active-color="#e00000" wx:if="{{show_channel}}">
<swiper-item class="first"> <swiper-item class="first">
<view wx:for="{{channel}}" wx:if="{{item.sort_order < 7}}" wx:key="{{item.id}}" class='icon-navi' data-cateid="{{item.id}}" bindtap="goCategory"> <view wx:for="{{channel}}" wx:if="{{item.sort_order < 7}}" wx:key="id" class='icon-navi' data-cateid="{{item.id}}" bindtap="goCategory">
<image class='icon-img' src="{{item.icon_url}}"></image> <image class='icon-img' src="{{item.icon_url}}"></image>
<view class='icon-text'>{{item.name}}</view> <view class='icon-text'>{{item.name}}</view>
</view> </view>
</swiper-item> </swiper-item>
<swiper-item class="first" wx:if="{{channel.length > 6}}"> <swiper-item class="first" wx:if="{{channel.length > 6}}">
<navigator wx:for="{{channel}}" wx:key="{{item.id}}" hover-class="none" class='icon-navi' url="/pages/category/index?id={{item.id}}" wx:if="{{item.sort_order > 6 && item.sort_order < 12}}"> <navigator wx:for="{{channel}}" wx:key="id" hover-class="none" class='icon-navi' url="/pages/category/index?id={{item.id}}" wx:if="{{item.sort_order > 6 && item.sort_order < 12}}">
<image class='icon-img' src="{{item.icon_url}}"></image> <image class='icon-img' src="{{item.icon_url}}"></image>
<view class='icon-text'>{{item.name}}</view> <view class='icon-text'>{{item.name}}</view>
</navigator> </navigator>
@ -55,7 +55,7 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="goods-container"> <view class="goods-container">
<view class='topic-container' wx:for="{{floorGoods}}" wx:key="{{item.id}}"> <view class='topic-container' wx:for="{{floorGoods}}" wx:key="id">
<view class='banner-container' bindtap="goCategory" data-cateid="{{item.id}}" wx:if="{{index_banner_img == 1}}"> <view class='banner-container' bindtap="goCategory" data-cateid="{{item.id}}" wx:if="{{index_banner_img == 1}}">
<image mode='aspectFill' style="width:100%;height:{{item.height}}rpx" src='{{item.banner}}'> <image mode='aspectFill' style="width:100%;height:{{item.height}}rpx" src='{{item.banner}}'>
</image> </image>
@ -69,7 +69,7 @@
</view> </view>
</view> </view>
<view class='list-wrap clearfix'> <view class='list-wrap clearfix'>
<view class="new-box {{(iindex+1)%3 == 0?'no-margin':''}}" wx:for="{{item.goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="{{iitem.id}}"> <view class="new-box {{(iindex+1)%3 == 0?'no-margin':''}}" wx:for="{{item.goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
<navigator hover-class='none' class='navi-url' url="/pages/goods/goods?id={{iitem.id}}"> <navigator hover-class='none' class='navi-url' url="/pages/goods/goods?id={{iitem.id}}">
<view class="box"> <view class="box">
<image src="{{iitem.list_pic_url}}" class="image"> <image src="{{iitem.list_pic_url}}" class="image">

291
pages/index/index.wxss
View File

@ -218,97 +218,6 @@
margin-top: 10rpx; margin-top: 10rpx;
} }
.m-menu {
display: flex;
height: 150rpx;
width: 750rpx;
flex-flow: row nowrap;
align-items: center;
justify-content: space-between;
background-color: #fff;
}
.m-menu .item {
flex: 1;
display: block;
padding: 20rpx 0;
}
.m-menu image {
display: block;
width: 58rpx;
height: 58rpx;
margin: 0 auto;
margin-bottom: 12rpx;
}
.m-menu text {
display: block;
font-size: 24rpx;
text-align: center;
margin: 0 auto;
line-height: 1;
color: #333;
}
.hot-goods-wrap {
width: 100%;
padding: 0 24rpx;
display: flex;
flex-direction: column;
box-sizing: border-box;
margin: 30rpx 0 0 0;
}
.hot-goods-wrap .best {
width: 702rpx;
height: 208rpx;
margin-bottom: 20rpx;
margin-top: 20rpx;
}
.hot-goods-wrap .best image {
width: 702rpx;
height: 208rpx;
}
.hot-goods-wrap .good-wrap {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 100%;
}
.hot-goods-wrap .good-wrap image {
width: 340rpx;
height: 250rpx;
}
/* banner end */
.fast-box .navi-url {
width: 100%;
display: flex;
justify-content: space-between;
}
.fast-box .box {
height: 100%;
width: 220rpx;
float: left;
margin-right: 24rpx;
position: relative;
}
.fast-box .box .image {
width: 220rpx;
height: 220rpx;
background: #fafafa;
position: relative;
border-radius: 4rpx;
border: 1rpx solid #eee;
}
.no-goods-mask { .no-goods-mask {
position: absolute; position: absolute;
left: 0; left: 0;
@ -319,162 +228,8 @@
opacity: 0.3; opacity: 0.3;
} }
.fast-box .see-more {
height: 90rpx;
text-align: center;
line-height: 90rpx;
color: #666;
font-size: 26rpx;
}
.fast-box .info-container {
width: 460rpx;
height: auto;
position: relative;
}
.fast-box .fast-out-status {
opacity: 0.5;
}
.info-container .goods-title {
font-size: 26rpx;
color: #333;
/* font-weight: bold; */
margin-bottom: 14rpx;
}
.info-container .tag {
display: flex;
justify-content: flex-start;
margin-bottom: 14rpx;
}
.info-container .tag .l {
height: 34rpx;
min-width: 100rpx;
padding: 0 14rpx;
background: #f3ebea;
color: #d14848;
font-size: 20rpx;
line-height: 34rpx;
text-align: center;
border: 1rpx solid #f3ebea;
}
.info-container .tag .m {
height: 34rpx;
min-width: 100rpx;
padding: 0 20rpx;
border: 1rpx solid #f3ebea;
color: #d14848;
font-size: 20rpx;
line-height: 34rpx;
text-align: center;
}
/* .info-container .fast-price{
display: flex;
justify-content: flex-start;
align-items: baseline;
margin-bottom: 14rpx;
} */
.info-container .fast-price {
display: flex;
flex-direction: column;
margin-bottom: 14rpx;
}
.fast-price .no-level {
font-size: 26rpx;
color: #e00000;
}
.fast-price .l {
font-size: 24rpx;
color: #cc2b1d;
}
.fast-price .r {
font-size: 32rpx;
color: #cc2b1d;
}
.fast-price .h {
font-size: 28rpx;
}
.fast-price .b {
display: flex;
justify-content: flex-start;
align-items: center;
}
.fast-price .b .price-t {
font-size: 30rpx;
color: #e00000;
margin-right: 6rpx;
}
.fast-price .b .price-tag {
border: 1rpx solid #e00000;
color: #e00000;
background: #ffeaea;
border-radius: 100rpx;
padding: 0 6rpx;
font-size: 14rpx;
text-align: center;
line-height: 22rpx;
height: 22rpx;
}
.info-container .tips {
font-size: 20rpx;
color: #888;
}
.info-container .fast-go {
position: absolute;
bottom: 0;
right: 0;
border: 1rpx solid #ca2a1d;
color: #ca2a1d;
font-size: 20rpx;
border-radius: 100rpx;
height: 44rpx;
width: 110rpx;
line-height: 44rpx;
text-align: center;
padding: 0 10rpx;
}
.info-container .fast-go-out {
position: absolute;
bottom: 0;
right: 0;
border: 1rpx solid #ccc;
background: #ccc;
color: #555;
font-size: 20rpx;
border-radius: 100rpx;
height: 44rpx;
width: 110rpx;
line-height: 44rpx;
text-align: center;
padding: 0 10rpx;
}
/* 信息容器 */ /* 信息容器 */
.new-buy .list-wrap, .goods-container .list-wrap {
display: block;
width: 100%;
padding: 26rpx 30rpx 10rpx 30rpx;
height: auto;
box-sizing: border-box;
}
.more-category { .more-category {
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -507,6 +262,15 @@
width: 120rpx; width: 120rpx;
} }
.new-buy .list-wrap,
.goods-container .list-wrap {
display: block;
width: 100%;
padding: 26rpx 30rpx 10rpx 30rpx;
height: auto;
box-sizing: border-box;
}
.list-wrap .no-margin { .list-wrap .no-margin {
margin-right: 0; margin-right: 0;
} }
@ -530,7 +294,8 @@
position: relative; position: relative;
margin-bottom: 10rpx; margin-bottom: 10rpx;
border-radius: 4rpx; border-radius: 4rpx;
/* border: 1rpx solid #eee; *//* box-sizing: border-box; */ /* border: 1rpx solid #eee; */
/* box-sizing: border-box; */
} }
.new-box .navi-url .box .new-tag { .new-box .navi-url .box .new-tag {
@ -547,10 +312,6 @@
border-radius: 0 40rpx 40rpx 0; border-radius: 0 40rpx 40rpx 0;
} }
.new-box .navi-url .goods-info {
/* width: 220rpx; */
}
.new-box .navi-url .goods-info .goods-title { .new-box .navi-url .goods-info .goods-title {
font-size: 24rpx; font-size: 24rpx;
color: #222; color: #222;
@ -610,36 +371,6 @@
justify-content: flex-start; justify-content: flex-start;
} }
.new-box .navi-url .goods-info .price-container .l .no-level {
font-size: 26rpx;
color: #e00000;
}
.new-box .navi-url .goods-info .price-container .l .b .price-w {
display: flex;
justify-content: flex-start;
align-items: center;
width: 100%;
}
.new-box .navi-url .goods-info .price-container .l .b .price-t {
font-size: 26rpx;
color: #e00000;
margin-right: 6rpx;
}
.new-box .navi-url .goods-info .price-container .l .b .price-tag {
border: 1rpx solid #e00000;
color: #e00000;
background: #ffeaea;
border-radius: 100rpx;
padding: 0 6rpx;
font-size: 14rpx;
text-align: center;
line-height: 22rpx;
height: 22rpx;
}
.new-box .navi-url .goods-info .price-container .retail-price { .new-box .navi-url .goods-info .price-container .retail-price {
font-size: 18rpx; font-size: 18rpx;
color: #000; color: #000;

2
pages/order-check/index.wxml
View File

@ -20,7 +20,7 @@
<view class="list-title">商品信息</view> <view class="list-title">商品信息</view>
<view class="a-goods"> <view class="a-goods">
<view class="img-box"> <view class="img-box">
<view class='image-wrap' wx:for="{{checkedGoodsList}}" wx:if="{{index<5}}" wx:key="{{item.id}}"> <view class='image-wrap' wx:for="{{checkedGoodsList}}" wx:if="{{index<5}}" wx:key="id">
<image src="{{item.list_pic_url}}" class="goods-image"></image> <image src="{{item.list_pic_url}}" class="goods-image"></image>
</view> </view>
</view> </view>

8
pages/search/search.wxml
View File

@ -14,7 +14,7 @@
<image class="icon" bindtap="clearHistory"></image> <image class="icon" bindtap="clearHistory"></image>
</view> </view>
<view class="b"> <view class="b">
<view class="item" bindtap="onKeywordTap" data-keyword="{{item}}" wx:for="{{historyKeyword}}" hover-class="navigator-hover" wx:key="{{item.id}}">{{item}}</view> <view class="item" bindtap="onKeywordTap" data-keyword="{{item}}" wx:for="{{historyKeyword}}" hover-class="navigator-hover" wx:key="id">{{item}}</view>
</view> </view>
</view> </view>
<view class="serach-keywords search-hot" wx:if="{{!keyword}}"> <view class="serach-keywords search-hot" wx:if="{{!keyword}}">
@ -22,11 +22,11 @@
<text class="title">热门搜索</text> <text class="title">热门搜索</text>
</view> </view>
<view class="b"> <view class="b">
<view class="item {{item.is_hot === 1 ? 'active' : ''}}" hover-class="navigator-hover" bindtap="onKeywordTap" data-keyword="{{item.keyword}}" wx:for="{{hotKeyword}}" wx:key="{{item.id}}">{{item.keyword}}</view> <view class="item {{item.is_hot === 1 ? 'active' : ''}}" hover-class="navigator-hover" bindtap="onKeywordTap" data-keyword="{{item.keyword}}" wx:for="{{hotKeyword}}" wx:key="id">{{item.keyword}}</view>
</view> </view>
</view> </view>
<view class="shelper-list" wx:if="{{keyword}}"> <view class="shelper-list" wx:if="{{keyword}}">
<view class="item" hover-class="navigator-hover" wx:for="{{helpKeyword}}" bindtap="onKeywordTap" data-keyword="{{item}}" wx:key="{{item.id}}">{{item}}</view> <view class="item" hover-class="navigator-hover" wx:for="{{helpKeyword}}" bindtap="onKeywordTap" data-keyword="{{item}}" wx:key="id">{{item}}</view>
</view> </view>
</view> </view>
@ -47,7 +47,7 @@
<view class="cate-item"> <view class="cate-item">
<view class="b"> <view class="b">
<view class='list-wrap clearfix'> <view class='list-wrap clearfix'>
<view class="goods-box {{(iindex+1)%2 == 0?'no-margin':''}}" wx:for="{{goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="{{iitem.id}}"> <view class="goods-box {{(iindex+1)%2 == 0?'no-margin':''}}" wx:for="{{goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
<navigator hover-class='none' class='navi-url' url="/pages/goods/goods?id={{iitem.id}}"> <navigator hover-class='none' class='navi-url' url="/pages/goods/goods?id={{iitem.id}}">
<view class="box"> <view class="box">
<image src="{{iitem.list_pic_url}}" class="image"> <image src="{{iitem.list_pic_url}}" class="image">

4
pages/ucenter/address-detail/index.wxml
View File

@ -50,13 +50,13 @@
<view class="region-select" wx:if="{{openSelectRegion}}"> <view class="region-select" wx:if="{{openSelectRegion}}">
<view class="hd"> <view class="hd">
<view class="region-selected"> <view class="region-selected">
<view class="item {{item.id == 0 ? 'disabled' : ''}} {{(regionType -1) === index ? 'selected' : ''}}" bindtap="selectRegionType" data-region-type-index="{{index}}" wx:for="{{selectRegionList}}" wx:key="{{item.id}}">{{item.name}}</view> <view class="item {{item.id == 0 ? 'disabled' : ''}} {{(regionType -1) === index ? 'selected' : ''}}" bindtap="selectRegionType" data-region-type-index="{{index}}" wx:for="{{selectRegionList}}" wx:key="id">{{item.name}}</view>
</view> </view>
<view class="done {{selectRegionDone ? '' : 'disabled'}}" bindtap="doneSelectRegion">确定</view> <view class="done {{selectRegionDone ? '' : 'disabled'}}" bindtap="doneSelectRegion">确定</view>
</view> </view>
<view class="bd"> <view class="bd">
<scroll-view scroll-y class="region-list"> <scroll-view scroll-y class="region-list">
<view class="item {{item.selected ? 'selected' : ''}}" bindtap="selectRegion" data-region-index="{{index}}" wx:for="{{regionList}}" wx:key="{{item.id}}">{{item.name}}</view> <view class="item {{item.selected ? 'selected' : ''}}" bindtap="selectRegion" data-region-index="{{index}}" wx:for="{{regionList}}" wx:key="id">{{item.name}}</view>
</scroll-view> </scroll-view>
</view> </view>
</view> </view>

2
pages/ucenter/address/index.wxml
View File

@ -1,6 +1,6 @@
<view class="container"> <view class="container">
<view class='has-info' wx:if="{{addresses.length > 0}}"> <view class='has-info' wx:if="{{addresses.length > 0}}">
<view bindtap="{{type == 0?'goAddressDetail':'selectAddress'}}" class='info-item' data-addressid="{{item.id}}" wx:for="{{addresses}}" wx:key="{{item.id}}"> <view bindtap="{{type == 0?'goAddressDetail':'selectAddress'}}" class='info-item' data-addressid="{{item.id}}" wx:for="{{addresses}}" wx:key="id">
<view class="selected" wx:if="{{type == 1}}"> <view class="selected" wx:if="{{type == 1}}">
<image wx:if="{{item.id == nowAddress}}" class="img" src="http://lucky-icon.meiweiyuxian.com/hio/gou-red.png"></image> <image wx:if="{{item.id == nowAddress}}" class="img" src="http://lucky-icon.meiweiyuxian.com/hio/gou-red.png"></image>
<image wx:else class="img" src="http://lucky-icon.meiweiyuxian.com/hio/gou-gray.png"></image> <image wx:else class="img" src="http://lucky-icon.meiweiyuxian.com/hio/gou-gray.png"></image>

2
pages/ucenter/goods-list/index.wxml
View File

@ -1,6 +1,6 @@
<view class="container"> <view class="container">
<view class='goods-list-container'> <view class='goods-list-container'>
<view class='goods-list-wrap' hover-class='none' wx:for="{{goodsList}}" wx:key="item.id" wx:for-item="item"> <view class='goods-list-wrap' hover-class='none' wx:for="{{goodsList}}" wx:key="id" wx:for-item="item">
<navigator hover-class='none' class='goods-nav' url='/pages/goods/goods?id={{item.goods_id}}'> <navigator hover-class='none' class='goods-nav' url='/pages/goods/goods?id={{item.goods_id}}'>
<view class='image-wrap'> <view class='image-wrap'>
<image class='goods-image' src='{{item.list_pic_url}}'></image> <image class='goods-image' src='{{item.list_pic_url}}'></image>

110
pages/ucenter/order-details/index.js
View File

@ -20,12 +20,12 @@ Page({
success: 0, success: 0,
imageUrl: '', imageUrl: '',
wxTimerList: {}, wxTimerList: {},
express:{}, express: {},
onPosting:0, onPosting: 0,
}, },
reOrderAgain: function () { reOrderAgain: function () {
let orderId = this.data.orderId let orderId = this.data.orderId
wx.navigateTo({ wx.redirectTo({
url: '/pages/order-check/index?addtype=2&orderFrom=' + orderId url: '/pages/order-check/index?addtype=2&orderFrom=' + orderId
}) })
}, },
@ -35,29 +35,29 @@ Page({
data: data, data: data,
success(res) { success(res) {
wx.getClipboardData({ wx.getClipboardData({
success(res) { } success(res) {}
}) })
} }
}) })
}, },
toGoodsList: function(e) { toGoodsList: function (e) {
let orderId = this.data.orderId; let orderId = this.data.orderId;
wx.navigateTo({ wx.navigateTo({
url: '/pages/ucenter/goods-list/index?id=' + orderId, url: '/pages/ucenter/goods-list/index?id=' + orderId,
}); });
}, },
toExpressInfo: function(e) { toExpressInfo: function (e) {
let orderId = this.data.orderId; let orderId = this.data.orderId;
wx.navigateTo({ wx.navigateTo({
url: '/pages/ucenter/express-info/index?id=' + orderId, url: '/pages/ucenter/express-info/index?id=' + orderId,
}); });
}, },
toRefundSelect: function(e) { toRefundSelect: function (e) {
wx.navigateTo({ wx.navigateTo({
url: '/pages/refund-select/index', url: '/pages/refund-select/index',
}); });
}, },
payOrder: function(e) { payOrder: function (e) {
let that = this; let that = this;
pay.payOrder(parseInt(that.data.orderId)).then(res => { pay.payOrder(parseInt(that.data.orderId)).then(res => {
that.getOrderDetail(); that.getOrderDetail();
@ -65,17 +65,17 @@ Page({
util.showErrorToast(res.errmsg); util.showErrorToast(res.errmsg);
}); });
}, },
toSelectAddress: function() { toSelectAddress: function () {
let orderId = this.data.orderId; let orderId = this.data.orderId;
wx.navigateTo({ wx.navigateTo({
url: '/pages/ucenter/address-select/index?id=' + orderId, url: '/pages/ucenter/address-select/index?id=' + orderId,
}); });
}, },
onLoad: function() { onLoad: function () {
}, },
onShow: function() { onShow: function () {
var orderId = wx.getStorageSync('orderId'); var orderId = wx.getStorageSync('orderId');
try { try {
this.setData({ this.setData({
@ -90,21 +90,28 @@ Page({
this.getOrderDetail(); this.getOrderDetail();
this.getExpressInfo(); this.getExpressInfo();
}, },
onUnload: function() { onUnload: function () {
let oCancel = this.data.handleOption.cancel; let oCancel = this.data.handleOption.cancel;
if (oCancel == true) { if (oCancel == true) {
let orderTimerID = this.data.wxTimerList.orderTimer.wxIntId; let orderTimerID = this.data.wxTimerList.orderTimer.wxIntId;
clearInterval(orderTimerID); clearInterval(orderTimerID);
} }
}, },
orderTimer: function(endTime) { onHide: function () {
let oCancel = this.data.handleOption.cancel;
if (oCancel == true) {
let orderTimerID = this.data.wxTimerList.orderTimer.wxIntId;
clearInterval(orderTimerID);
}
},
orderTimer: function (endTime) {
let that = this; let that = this;
var orderTimerID = ''; var orderTimerID = '';
let wxTimer2 = new timer({ let wxTimer2 = new timer({
endTime: endTime, endTime: endTime,
name: 'orderTimer', name: 'orderTimer',
id: orderTimerID, id: orderTimerID,
complete: function() { complete: function () {
that.letOrderCancel(); that.letOrderCancel();
}, },
}) })
@ -116,35 +123,14 @@ Page({
postscript: postscript postscript: postscript
}); });
}, },
cancelRefund: function() { getExpressInfo: function () {
let that = this;
wx.showModal({
title: '',
content: '确定要取消退款？',
success: function(res) {
if (res.confirm) {
util.request(api.CancelRefund, {
orderId: that.data.orderId
}, 'POST').then(function(res) {
if (res.errno === 0) {
wx.showToast({
title: '取消退款成功！'
});
that.getOrderDetail();
} else {
util.showErrorToast(res.errmsg);
}
});
}
}
});
},
getExpressInfo:function() {
this.setData({ this.setData({
onPosting:0 onPosting: 0
}) })
let that = this; let that = this;
util.request(api.OrderExpressInfo, { orderId: that.data.orderId }).then(function (res) { util.request(api.OrderExpressInfo, {
orderId: that.data.orderId
}).then(function (res) {
if (res.errno === 0) { if (res.errno === 0) {
let express = res.data; let express = res.data;
express.traces = JSON.parse(res.data.traces); express.traces = JSON.parse(res.data.traces);
@ -155,11 +141,11 @@ Page({
} }
}); });
}, },
getOrderDetail: function() { getOrderDetail: function () {
let that = this; let that = this;
util.request(api.OrderDetail, { util.request(api.OrderDetail, {
orderId: that.data.orderId orderId: that.data.orderId
}).then(function(res) { }).then(function (res) {
if (res.errno === 0) { if (res.errno === 0) {
that.setData({ that.setData({
orderInfo: res.data.orderInfo, orderInfo: res.data.orderInfo,
@ -168,15 +154,10 @@ Page({
textCode: res.data.textCode, textCode: res.data.textCode,
goodsCount: res.data.goodsCount goodsCount: res.data.goodsCount
}); });
let orderType = res.data.orderInfo.order_type;
if (orderType == 2) {
that.getImageUrl();
}
}
let receive = res.data.textCode.receive; let receive = res.data.textCode.receive;
if(receive == true){ if (receive == true) {
let confirm_remainTime = res.data.orderInfo.confirm_remainTime; let confirm_remainTime = res.data.orderInfo.confirm_remainTime;
remaintimer.reTime(confirm_remainTime,'c_remainTime',that); remaintimer.reTime(confirm_remainTime, 'c_remainTime', that);
} }
let oCancel = res.data.handleOption.cancel; let oCancel = res.data.handleOption.cancel;
let payTime = 0; let payTime = 0;
@ -184,14 +165,15 @@ Page({
payTime = res.data.orderInfo.final_pay_time payTime = res.data.orderInfo.final_pay_time
that.orderTimer(payTime); that.orderTimer(payTime);
} }
}
}); });
wx.hideLoading(); wx.hideLoading();
}, },
letOrderCancel: function() { letOrderCancel: function () {
let that = this; let that = this;
util.request(api.OrderCancel, { util.request(api.OrderCancel, {
orderId: that.data.orderId orderId: that.data.orderId
}, 'POST').then(function(res) { }, 'POST').then(function (res) {
if (res.errno === 0) { if (res.errno === 0) {
that.getOrderDetail(); that.getOrderDetail();
} else { } else {
@ -200,21 +182,22 @@ Page({
}); });
}, },
// “删除”点击效果 // “删除”点击效果
deleteOrder: function() { deleteOrder: function () {
let that = this; let that = this;
wx.showModal({ wx.showModal({
title: '', title: '',
content: '确定要删除此订单？', content: '确定要删除此订单？',
success: function(res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
util.request(api.OrderDelete, { util.request(api.OrderDelete, {
orderId: that.data.orderId orderId: that.data.orderId
}, 'POST').then(function(res) { }, 'POST').then(function (res) {
if (res.errno === 0) { if (res.errno === 0) {
wx.showToast({ wx.showToast({
title: '删除订单成功' title: '删除订单成功'
}); });
wx.removeStorageSync('orderId'); wx.removeStorageSync('orderId');
wx.setStorageSync('doRefresh', 1);
wx.navigateBack(); wx.navigateBack();
} else { } else {
util.showErrorToast(res.errmsg); util.showErrorToast(res.errmsg);
@ -224,22 +207,22 @@ Page({
} }
}); });
}, },
// “确认收货”点击效果 // “确认收货”点击效果
confirmOrder: function() { confirmOrder: function () {
let that = this; let that = this;
wx.showModal({ wx.showModal({
title: '', title: '',
content: '收到货了？确认收货？', content: '收到货了？确认收货？',
success: function(res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
util.request(api.OrderConfirm, { util.request(api.OrderConfirm, {
orderId: that.data.orderId orderId: that.data.orderId
}, 'POST').then(function(res) { }, 'POST').then(function (res) {
if (res.errno === 0) { if (res.errno === 0) {
wx.showToast({ wx.showToast({
title: '确认收货成功！' title: '确认收货成功！'
}); });
wx.setStorageSync('doRefresh', 1);
that.getOrderDetail(); that.getOrderDetail();
} else { } else {
util.showErrorToast(res.errmsg); util.showErrorToast(res.errmsg);
@ -250,19 +233,17 @@ Page({
}); });
}, },
// “取消订单”点击效果 // “取消订单”点击效果
cancelOrder: function(e) { cancelOrder: function (e) {
let that = this; let that = this;
wx.showModal({ wx.showModal({
title: '', title: '',
content: '确定要取消此订单？', content: '确定要取消此订单？',
success: function(res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
util.request(api.OrderCancel, { util.request(api.OrderCancel, {
orderId: that.data.orderId orderId: that.data.orderId
}, 'POST').then(function(res) { }, 'POST').then(function (res) {
if (res.errno === 0) { if (res.errno === 0) {
let orderTimerID = that.data.wxTimerList.orderTimer.wxIntId;
clearInterval(orderTimerID);
wx.showToast({ wx.showToast({
title: '取消订单成功' title: '取消订单成功'
}); });
@ -273,6 +254,9 @@ Page({
allCount: 0, allCount: 0,
size: 8 size: 8
}); });
wx.setStorageSync('doRefresh', 1);
let orderTimerID = that.data.wxTimerList.orderTimer.wxIntId;
clearInterval(orderTimerID);
that.getOrderDetail(); that.getOrderDetail();
} else { } else {
util.showErrorToast(res.errmsg); util.showErrorToast(res.errmsg);

2
pages/ucenter/order-details/index.wxml
View File

@ -69,7 +69,7 @@
</view> </view>
<view class="a-goods"> <view class="a-goods">
<view class="img-box"> <view class="img-box">
<view class='image-wrap' wx:for="{{orderGoods}}" wx:key="{{item.id}}" wx:if="{{index<4}}"> <view class='image-wrap' wx:for="{{orderGoods}}" wx:key="id" wx:if="{{index<4}}">
<image src="{{item.list_pic_url}}" class="goods-image" /> <image src="{{item.list_pic_url}}" class="goods-image" />
</view> </view>
</view> </view>

4
pages/ucenter/order-list/index.js
View File

@ -86,7 +86,8 @@ Page({
onShow: function() { onShow: function() {
let showType = wx.getStorageSync('showType'); let showType = wx.getStorageSync('showType');
let nowShowType = this.data.showType; let nowShowType = this.data.showType;
if (nowShowType != showType) { let doRefresh = wx.getStorageSync('doRefresh');
if (nowShowType != showType || doRefresh == 1) {
this.setData({ this.setData({
showType: showType, showType: showType,
orderList: [], orderList: [],
@ -96,6 +97,7 @@ Page({
size: 8 size: 8
}); });
this.getOrderList(); this.getOrderList();
wx.removeStorageSync('doRefresh');
} }
this.getOrderInfo(); this.getOrderInfo();
}, },

2
pages/ucenter/order-list/index.wxml
View File

@ -33,7 +33,7 @@
<view class="goods-list"> <view class="goods-list">
<view class="a-goods"> <view class="a-goods">
<view class="img-box"> <view class="img-box">
<view class='image-wrap' wx:for="{{item.goodsList}}" wx:key="{{id}}" wx:for-item="gitem" wx:if="{{index<4}}"> <view class='image-wrap' wx:for="{{item.goodsList}}" wx:key="id" wx:for-item="gitem" wx:if="{{index<4}}">
<image src="{{gitem.list_pic_url}}" class="goods-image" /> <image src="{{gitem.list_pic_url}}" class="goods-image" />
</view> </view>
</view> </view>

5
project.config.json
View File

@ -4,10 +4,13 @@
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"postcss": true, "postcss": true,
"preloadBackgroundData": false,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
"coverView": true, "coverView": true,
"autoAudits": false, "autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"checkInvalidKey": true, "checkInvalidKey": true,
"checkSiteMap": false, "checkSiteMap": false,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
@ -20,7 +23,7 @@
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.9.4", "libVersion": "2.9.4",
"appid": "wxf3d768d1818218f1", "appid": "wxf3d768d1818218f1",
"projectname": "%E6%B5%B7%E9%B8%A5%E5%95%86%E5%9F%8E", "projectname": "%e6%b5%b7%e9%a3%8e%e5%b0%8f%e5%ba%97",
"isGameTourist": false, "isGameTourist": false,
"scripts": { "scripts": {
"beforeCompile": "", "beforeCompile": "",