Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/app.js

@@ -110,7 +110,6 @@ App({
    */
   wxRequest: function (url, params, callback, thisArg, methods, openid) {
     let that = this;
-
     var httpUrl = url;
     var str = "";
     var count = 0;
@@ -135,8 +134,8 @@ App({
         method: methods,
         header: {
           "content-type": "application/x-www-form-urlencoded",
-          "OPENID": this.globalData.openid,
-          "VERSION":100
+          "VERSION": '100',
+          "OPENID": this.globalData.openid
         },
         success: function (re) {
           // if (re.data.code == -1002) {
@@ -158,6 +157,7 @@ App({
         method: methods,
         header: {
           "OPENID": this.globalData.openid,
+          "VERSION": '100'
         },
         success: function (re) {
           if (re.data.code == -1002) {

496_dongfengqichen/pages/index/index.wxml

@@ -2,7 +2,7 @@
 <view class="all" wx:if="{{mainShow}}">
   <view class="main" wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}">
     <view class="contentFrame">
-      <image style="width:750rpx;" mode="widthFix" src="{{kvurl}}"></image>
+      <image style="width:750rpx;height:0rpx;" mode="widthFix" src="{{kvurl}}"></image>
       <image style="width:750rpx;height:331rpx;" src="{{imgUrl+'/images/indexText.png'}}"></image>
       <view class="swiperFrame">
         <swiper class="swiperSty" autoplay current="{{swiperCurrent}}" bindchange="swiperChange">

496_dongfengqichen/pages/luckyStar/luckyStar.js

@@ -419,11 +419,11 @@ Page({
     }
   },
   changeScroll:function(){
-    // this.data.setInt = setInterval(()=>{
-    //   this.setData({
-    //     scrollNum: this.data.scrollNum+=1
-    //   })
-    // },30);
+    this.data.setInt = setInterval(()=>{
+      this.setData({
+        scrollNum: this.data.scrollNum+=1
+      })
+    },30);
   },
   getMore:function(){
     if (!this.data.isMore){

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -26,7 +26,6 @@ view{
   justify-content: center;
   width: 161rpx;
   height: 161rpx;
-  border-radius: 50%;
   margin: 0 auto;
   margin-bottom: 27rpx;
   overflow: hidden;
@@ -34,6 +33,7 @@ view{
 .defaultHead{
   width: 100%;
   height: 100%;
+  border-radius: 50%;
 }
 .loginBtn{
   position: relative;