Quellcode durchsuchen

修复ui iOS不一致

wangxin vor 6 Jahren
Ursprung
Commit
792824ec45

BIN
.DS_Store


+ 4 - 0
app.wxss

@@ -1,6 +1,10 @@
 /**app.wxss**/
 @import '/style/template.wxss';
 
+page {
+  background: #f5f5f5;
+}
+
 .container {
   display: flex;
   flex-direction: column;

+ 6 - 4
component/select-district/select-district.wxss

@@ -47,8 +47,9 @@
 
 .province-item {
   width: 250rpx;
-  /* height: 88rpx; */
-  padding: 30rpx 0;
+  height: 88rpx;
+  /* padding: 30rpx 0; */
+  flex-shrink: 0;
   font-size: 28rpx;
   color: #31364c;
   background: #f8f8f8;
@@ -68,8 +69,9 @@
 
 .city-item, .area-item {
   width: 250rpx;
-  /* height: 88rpx; */
-    padding: 30rpx 0;
+  height: 88rpx;
+  /* padding:  0 5rpx; */
+  flex-shrink: 0;
   font-size: 28rpx;
   color: #888a8e;
   display: flex;

+ 2 - 2
config.js

@@ -1,9 +1,9 @@
 // 测试服
-// const apiUrl = "https://hw.hap-job.com/happy-boot"
+const apiUrl = "https://hw.hap-job.com/happy-boot"
 // const imgServerUrl = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina"//图片服务器地址
 // const imgServerUrl_new = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com"//图片服务器地址
 // 正式服
-const apiUrl = "https://www.dal-pay.com/happy-boot"
+// const apiUrl = "https://www.dal-pay.com/happy-boot"
 // const imgServerUrl = "https://happyjob.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina"//图片服务器地址
 // const imgServerUrl_new = "https://happyjob.oss-cn-shanghai.aliyuncs.com"//图片服务器地址
 

+ 1 - 1
pages/detail/detail.wxss

@@ -34,7 +34,7 @@ page {
 .money {
   color: #3243bd;
   font-size: 38rpx;
-  flex-basis: 300rpx;
+  flex-basis: 490rpx;
   text-align: right;
 }
 

+ 12 - 2
pages/index/index.js

@@ -304,7 +304,11 @@ Page({
         this.doAnimation(false);
       },
       complete: () => {
-        wx.stopPullDownRefresh();
+        wx.stopPullDownRefresh({
+          success: () => {
+            console.log('stopPullDownRefresh')
+          }
+        });
       }
     })
   },
@@ -377,6 +381,13 @@ Page({
       duration: 600,
       timingFunction: 'ease',
     })
+    wx.getSystemInfo({
+      success: res => {
+        this.setData({
+          per: 750 / res.windowWidth
+        })
+      }
+    })
     wx.createSelectorQuery().select('.choose-area').boundingClientRect((rect) => {
       this.setData({
         fixTop: rect.top,
@@ -407,7 +418,6 @@ Page({
       pageNo: 1,
       scrollTop: 0
     }, _ => {
-      this.doAnimation(true)
       this.getList()
     })
   },

+ 4 - 4
pages/index/index.wxml

@@ -1,6 +1,7 @@
 <!--index.wxml-->
 <wxs src="../../app.wxs" module='tool' />
-<view class="container {{transition?'':'transition'}}" hidden="{{show}}">
+<wxs src="index.wxs" module='index' />
+<view class="container" style="top:{{transition?'0':index.getTop(scrollTop, per)}}rpx" hidden="{{show}}">
 
   <!-- 轮播及条件筛选开始 -->
   <view class="block">
@@ -49,7 +50,7 @@
   <!-- 轮播及条件筛选结束 -->
 
   <!-- 需求列表开始 -->
-  <view class="list">
+  <view class="list {{fixTop < scrollTop?'margin':''}} ">
 
     <view class="list-item" wx:for='{{list}}' wx:key='{{index}}' data-id="{{item.id}}" bindtap="toDetail">
       <view class="top">
@@ -102,5 +103,4 @@
 <view class="cover" animation='{{cover_animation}}'>
   <select-district bind:colose='coloseDistrict' bind:submit='saveDistrict' />
 </view>
-<!-- 蒙层  地区选择结束 -->
-
+<!-- 蒙层  地区选择结束 -->

+ 8 - 0
pages/index/index.wxs

@@ -0,0 +1,8 @@
+function getTop(scrollTop, per) {
+
+  return -416 + scrollTop * per
+}
+
+module.exports = {
+  getTop: getTop,
+}

+ 7 - 3
pages/index/index.wxss

@@ -101,8 +101,8 @@ swiper-item image {
 }
 
 .condition view image {
-  height: 20rpx;
-  width: 20rpx;
+  height: 9rpx;
+  width: 16rpx;
   margin-left: 10rpx;
 }
 
@@ -190,7 +190,7 @@ swiper-item image {
 .payment {
   color: #3243bd;
   font-size: 34rpx;
-  flex-basis: 300rpx;
+  flex-basis: 490rpx;
   text-align: right;
 }
 
@@ -295,3 +295,7 @@ swiper-item image {
   top: 0;
   left: 0;
 }
+
+.margin {
+  margin-top: 142rpx;
+}

+ 1 - 1
pages/login/login.js

@@ -2,7 +2,7 @@
 const app = getApp();
 const speed = 1000;
 const time = 60;
-const interval = 200;
+const interval = 50;
 let phoneInter = false;
 let codeInter = false;
 Page({

+ 4 - 0
pages/login/login.wxss

@@ -1,5 +1,9 @@
 /* pages/login/login.wxss */
 
+page {
+  background: #fff;
+}
+
 .container {
   padding: 30rpx;
 }

+ 5 - 4
pages/my-order/my-order.js

@@ -60,11 +60,12 @@ Page({
             title: '订单已确认',
             success: res => {
               // 确认成功  更改页面订单状态
-              const list = this.data.list;
-              list[index].status = 2;
-              list[index].serviceStage = 1;
+              // const list = this.data.list;
+              // list[index].status = 2;
+              // list[index].serviceStage = 1;
               this.setData({
-                list
+                [`list[${index}].status`]: 2,
+                [`list[${index}].serviceStage`]: 2,
               })
             }
           })

+ 4 - 0
pages/service_agreement/service_agreement.wxss

@@ -1,5 +1,9 @@
 /* pages/service_agreement/service_agreement.wxss */
 
+page {
+  background: #fff;
+}
+
 .container {
   font-size: 28rpx;
   padding: 15rpx 30rpx;

+ 1 - 1
pages/success/success.wxml

@@ -10,6 +10,6 @@
     </view>
   </view>
   <view class="version" wx:if='{{version}}'>
-    v1.0.0
+    v1.0.1
   </view>
 </view>

+ 1 - 1
pages/success/success.wxss

@@ -12,7 +12,7 @@ page {
 
 .hint-pic {
   width: 750rpx;
-  background: #eee;
+  /* background: #eee; */
 }
 
 .message {

+ 1 - 1
project.config.json

@@ -24,7 +24,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.3",
-	"appid": "wxb0f8f3f0de6e8f07",
+	"appid": "wx997164f2857c1a1d",
 	"projectname": "Mina_B",
 	"debugOptions": {
 		"hidedInDevtools": []