Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

pages/list/bj/index.js

@@ -141,7 +141,7 @@ Page({
   onShareAppMessage: function () {
 
   },
-  goBj: function () {
+  go_bj: function () {
     if (this.data.total == 3) {
       wx.showToast({
         title: '报价次数为0',

pages/list/bj/index.wxml

@@ -73,7 +73,7 @@
     </view>
   </view>
   <view class="bj-btn-view" wx:if="{{priceList}}">
-    <view class="btn-com  bj-btn {{total!=3?'btn-com-b':'btn-com-disable'}}" bindtap="goBj">
+    <view id="bjBth" class="btn-com  bj-btn {{total!=3?'btn-com-b':'btn-com-disable'}}" bindtap="go_bj">
       <block wx:if="{{total == 3}}">
         剩余0次
       </block>

pages/search/index/index.wxml

@@ -7,7 +7,7 @@
   <view class="rm_search" wx:if="{{rmList.length}}">
     <text class="title beforeLine">热门搜索</text>
     <view class="rm_ls_content row" >
-      <view class="search-item"  wx:for="{{rmList}}" wx:key="*this" bindtap="toSearch" data-title="{{item.title}}">{{item.title}}</view>
+      <view class="search-item"  wx:for="{{rmList}}" wx:key="{{index}}" bindtap="toSearch" data-title="{{item.title}}">{{item.title}}</view>
     </view>
   </view>
   <view class="ls_search"  wx:if="{{historyList.length}}">
@@ -16,7 +16,7 @@
       <text class="icon iconfont iconiconxiantiaoshouji7" bindtap="deleteHistory"></text>
     </view>
     <view class="rm_ls_content row">
-      <view class="search-item" wx:for="{{historyList}}" wx:key="*this" bindtap="toSearch" data-title="{{item}}">{{item}}</view>
+      <view class="search-item" wx:for="{{historyList}}" wx:key="{{index}}" bindtap="toSearch" data-title="{{item}}">{{item}}</view>
     </view>
 
   </view>

pages/tab/home/home.wxml

@@ -28,7 +28,7 @@
         <view class=" row bothSide verCenter advs-content-parent">
           <view class="advs-content">
             <swiper vertical="true" circular="true" interval="2000" autoplay display-multiple-items='{{multiple}}' style="height:{{multiple==1?'55rpx':'110rpx'}}">
-              <swiper-item wx:for="{{xjList}}" wx:key="*this">
+              <swiper-item wx:for="{{xjList}}" wx:key="{{index}}">
                 <view class="adv row verCenter">
                   <text class="adv-mark">询价</text>
                   <text class="adv-num ellipsis">{{item.goods_name||'--'}}</text>