3月30日提交

pages/appbusiness0/index.js

@@ -461,7 +461,8 @@ wx.getLocation({
     }else{
      
       var name = e.detail.value.txtName.replace(/\s+/g, "");
-      var number=e.detail.value.txtnumber.replace(/\s+/g, "");
+      // var number=e.detail.value.txtnumber.replace(/\s+/g, "");
+      var number="1";
       var tel=e.detail.value.txttel.replace(/\s+/g, "");
       var Province=(that.data.hx_index==-1?"":that.data.Provinces[that.data.hx_index].ProvinceID)
       var City=(that.data.hx_index0==-1?"":that.data.Citys[that.data.hx_index0].CityID)
@@ -472,12 +473,13 @@ wx.getLocation({
       var LoginId = wx.getStorageSync("LoginId")
       var b=true
       if(that.data.clsid==0){
-        b=false
-        wx.showToast({
-          title: "商家分类未选择！",
-          icon: "none",
-          duration: 3000
-         })
+        // b=false
+        // wx.showToast({
+        //   title: "商家分类未选择！",
+        //   icon: "none",
+        //   duration: 3000
+        //  })
+        that.data.clsid=198
     }
     if(b){
       if(name==""){
@@ -486,17 +488,18 @@ wx.getLocation({
             title: "商家名称不能为空！",
             icon: "none",
             duration: 3000
-           })
+           }) 
       }
      }
       if(b){
       if(number==""){
-        b=false
-        wx.showToast({
-          title: "信用代码不能为空！",
-          icon: "none",
-          duration: 3000
-         })
+        number="1"
+        // b=false
+        // wx.showToast({
+        //   title: "信用代码不能为空！",
+        //   icon: "none",
+        //   duration: 3000
+        //  })
       }
     }
     if(b){

pages/appbusiness0/index.wxml

@@ -7,17 +7,17 @@
       <view class="frombody">
            
         <view class="area">   
-          <picker class="picker_hx" name="picker_hx0" value="{{clslist[hc_index].id}}" data-selecthx="{{clslist[hc_index].name}}" range="{{clslist}}" range-key="{{'name'}}" bindchange="clsChange">
+          <!-- <picker class="picker_hx" name="picker_hx0" value="{{clslist[hc_index].id}}" data-selecthx="{{clslist[hc_index].name}}" range="{{clslist}}" range-key="{{'name'}}" bindchange="clsChange">
                   <text>商家分类：</text><input name="sjfl" type="text" disabled="disabled" placeholder="请选择商家分类" value="{{clsname}}"/><image src="../../images/icon-arrowdown.png"></image>
-          </picker>
+          </picker> -->
             </view>
             <view>
                   <text>商家名称：</text><input name="txtName" type="text" placeholder="请填写商家名称" value="{{sjname}}" />
             </view>
 
-            <view>
+            <!-- <view>
                   <text>信用代码：</text><input name="txtnumber" type="text" placeholder="请填写统一社会信用代码" value="{{number}}" />
-            </view>
+            </view> -->
             <view>
                   <text>联系电话：</text><input name="txttel" type="text" placeholder="请填写联系电话" value="{{tel}}" />
             </view>

pages/cart/index.js

@@ -153,7 +153,8 @@ Page( {
             if (b > zkc) {
                b = zkc
             }
-            if (b <= 0) {
+            //从不能小于等于0改成不能小于0
+            if (b < 0) {
                 wx.showToast({
                     title: "输入的数量有误,应为[1-999]",
                     icon: "none",

pages/details/index.js

@@ -74,7 +74,12 @@ Page({
         checked:0,
         vipqx:0,
         loadingHidden:false,
-        fromHot:0
+        fromHot:0,
+        swiperHeight: 375,
+        swiperDefaultRatio: 1,
+        swiperLoaded: false,
+        imageLoadCount: 0,
+        windowWidth: 375
     }, 
 
     onLoad: function(options) {
@@ -95,9 +100,40 @@ Page({
                 })
         }
         
-        
         that.rdata(0)
-    },onPullDownRefresh: function () {
+    },
+    onReady: function() {
+        var systemInfo = wx.getSystemInfoSync();
+        var windowWidth = systemInfo.windowWidth;
+        var defaultHeight = windowWidth * 0.75;
+        that.setData({
+            swiperHeight: defaultHeight,
+            windowWidth: windowWidth
+        });
+    },
+    onSwiperImageLoad: function(e) {
+        if (that.data.swiperLoaded) {
+            return;
+        }
+        var loadCount = that.data.imageLoadCount + 1;
+        var showimages = that.data.showimages;
+        if (showimages && showimages.length > 0 && loadCount === 1) {
+            var imgWidth = e.detail.width;
+            var imgHeight = e.detail.height;
+            if (imgWidth > 0 && imgHeight > 0) {
+                var windowWidth = that.data.windowWidth || wx.getSystemInfoSync().windowWidth;
+                var ratio = imgHeight / imgWidth;
+                var calculatedHeight = windowWidth * ratio;
+                that.setData({
+                    swiperHeight: calculatedHeight,
+                    swiperDefaultRatio: ratio,
+                    swiperLoaded: true,
+                    imageLoadCount: loadCount
+                });
+            }
+        }
+    },
+    onPullDownRefresh: function () {
         //在当前页面显示导航条加载动画
          wx.showNavigationBarLoading(); 
         //显示 loading 提示框。需主动调用 wx.hideLoading 才能关闭提示框
@@ -159,7 +195,9 @@ Page({
                     ptgztitle0:res.data.ptgztitle0,
                     sharetitle:res.data.sharetitle,
                     sharepic:res.data.sharepic,
-                    yjptnum:res.data.yjptnum
+                    yjptnum:res.data.yjptnum,
+                    swiperLoaded: false,
+                    imageLoadCount: 0
                 })
                 that.getselguige();
                 if(that.data.IFPD==0){
@@ -688,6 +726,8 @@ Page({
                 showimage:showimage,
                 showimages:showimages,
                 showindex:showindex,
+                swiperLoaded: false,
+                imageLoadCount: 0
             })  
        }
         that.setData({

pages/details/index.wxml

@@ -2,11 +2,11 @@
 
 <view class="container">
     <view>
-        <swiper class="swiper_box" indicator-dots="{{indicatorDots}}" vertical="{{vertical}}"  circular="true" 
+        <swiper class="swiper_box" style="height: {{swiperHeight}}px;" indicator-dots="{{indicatorDots}}" vertical="{{vertical}}"  circular="true" 
                 autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
             <block wx:for="{{showimages}}">
                 <swiper-item> 
-                    <image src="{{item.img}}"  bindtap="viewimages0" data-index="{{index}}" class="slide-image"/>
+                    <image src="{{item.img}}" bindtap="viewimages0" data-index="{{index}}" class="slide-image" mode="aspectFit" bindload="onSwiperImageLoad" data-index="{{index}}"/>
                 </swiper-item>
             </block>
         </swiper> 

pages/details/index.wxss

@@ -18,7 +18,8 @@ page{
   
 .swiper_box {
     width: 100%;
-    height: 21em; 
+    transition: height 0.3s ease-out;
+    -webkit-transition: height 0.3s ease-out;
 }
 .swiper_box .slide-image{
     width: 100%;

pages/mybankdata/index.js

@@ -64,6 +64,7 @@ Page( {
           title: "绑定收款账号"
         })
       }
+    
       wx.request({
         url: app.globalData.apiurl + "/xapiajax.ashx", 
         data: { 

pages/mybankdata/index.wxml

@@ -1,5 +1,5 @@
-<view class="container" wx:if="{{umoney>0||umoney0>0}}">
-  
+<!-- <view class="container" wx:if="{{umoney>0||umoney0>0}}"> -->
+  <view class="container"  > 
     
       <view class="myorder-menu">
             <view class='{{nav==0?"hover":""}}' bindtap="onnav" data-id="0">银行账号</view>

pages/myto/index.js

@@ -9,7 +9,7 @@ Page( {
         text: '会员资料'
       },{
         icon: '../../images/iconfont-mydata.png',
-        url:'../mybankdata/index',
+        url:'../mybankdata/index?nav=0',
         text: '绑定收款账号'
       }, {
         icon: '../../images/iconfont-mypassword.png',

pages/myusers/index.wxml

@@ -45,9 +45,9 @@
                       <view>{{item.UserName}}<text>{{item.RealName}}</text></view>
                       <view class="time">{{item.uLevel}} 当月业绩：{{item.zcount}}</view>
                 </view>
-                <view class="uLevel">
+                <!-- <view class="uLevel">
                       {{item.zt}}{{item.zt0}}
-                </view>
+                </view> -->
                 <view class="faifeito">
                       <image src="../../images/faifeito.png"></image>
                 </view>

pages/qhaddress/index.js

@@ -7,8 +7,6 @@ Page( {
   },
 
   onLoad: function() {
-      that = this
-
       that = this
       wx.setBackgroundColor({
         backgroundColor: "#96C6F5",