调整活动商城页面滑动

pages/my/actGoods/index.scss

@@ -5,6 +5,8 @@
 	padding-bottom: 54rpx;
 	background: #F1F1F1;
 	min-height: calc(100vh - 56rpx);
+	
+	overflow-x: hidden;
 }
 .con{
 			width:100%;

pages/my/duijiang/index.scss

@@ -1,5 +1,5 @@
 .page{
-	height:100vh;
+	min-height:100vh;
 	background: #F1F1F1;
 }
 .content{

pages/my/duijiang/index.vue

@@ -25,7 +25,7 @@
 						兑奖信息
 					</view>
 					<view class="right">
-						{{item.award_content}}
+						{{item.award_content?item.award_content:'暂无'}}
 					</view>
 				</view>
 				<view class="line">

pages/my/inviteDetail/index.scss

@@ -126,7 +126,9 @@
 }
 
 .botDes{
-	height: calc(55vh);
+	height: calc(100vh - 764rpx);
+	// height: calc(100vh - 728rpx);
+	// height: calc(55vh);
 	background: #FFFFFF;
 	border-radius: 24rpx 24rpx 0rpx 0rpx;
 	margin-top: -36rpx;

pages/my/inviteDetail/index.vue

@@ -49,9 +49,8 @@ height: 140rpx;"></image>
 								邀约L会员
 							</view>
 						</view>
-						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
-					height: 140rpx;"></image> -->
-
+						<image :src="picUrl+'/static/other/inviteW.png'" mode="" class="water" style="width: 288rpx;
+						height: 140rpx;"></image>
 					</view>
 
 					<view class="btnG" v-else-if="type=='dg'">
@@ -63,8 +62,8 @@ height: 140rpx;"></image>
 								邀约电工
 							</view>
 						</view>
-						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
-					height: 140rpx;"></image> -->
+						<image :src="picUrl+'/static/other/inviteW.png'" mode="" class="water" style="width: 288rpx;
+					height: 140rpx;"></image>
 
 					</view>
 
@@ -77,8 +76,8 @@ height: 140rpx;"></image>
 								邀约活动用户
 							</view>
 						</view>
-						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
-					height: 140rpx;"></image> -->
+						<image :src="picUrl+'/static/other/inviteW.png'" mode="" class="water" style="width: 288rpx;
+						height: 140rpx;"></image>
 
 					</view>
 
@@ -91,8 +90,8 @@ height: 140rpx;"></image>
 								邀约会员
 							</view>
 						</view>
-						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
-					height: 140rpx;"></image> -->
+						<image :src="picUrl+'/static/other/inviteW.png'" mode="" class="water" style="width: 288rpx;
+						height: 140rpx;"></image>
 
 					</view>
 				</view>
@@ -113,7 +112,7 @@ height: 140rpx;"></image>
 			</view>
 
 			<!-- 提交邀约申请成功，请点击上方分享按钮分享至微信 -->
-			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx);" v-if="currTabIndex==0">
+			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx + 36rpx);" v-if="currTabIndex==0">
 				<view class="top1">
 					<view class="titleL">
 						<view class="item1">
@@ -197,14 +196,16 @@ height: 140rpx;"></image>
 						<text>{{item.phone}}</text>
 					</view>
 				</view>
-				<view class="pos" style="height:208rpx;">
+				<u-loadmore v-if="sucList.length!=0" style="" status="false" nomoreText="已经到底啦" color="#CCCCCC"
+					lineColor="#CCCCCC" line />
+				<view class="pos" style="height:50rpx;">
 				</view>
 
 			</view>
 
 
 			<!--  邀约失败 -->
-			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx);" v-if="currTabIndex==1">
+			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx + 36rpx);" v-if="currTabIndex==1">
 				<view class="top1">
 					<view class="titleL">
 						<view class="item1" style="width: 192rpx;font-size: 28rpx;font-weight: bold;color: #333333;">
@@ -225,10 +226,10 @@ height: 140rpx;"></image>
 					<view class="item1" style="width: 192rpx;font-size: 28rpx;">
 						{{item.invite_time}}
 					</view>
-					<view class="item1 nextLine" style="width: 130rpx;font-size: 28rpx;margin-left: -5rpx;">
+					<view class="item1 nextLine" style="width: 130rpx;font-size: 28rpx;margin-left: 0rpx;">
 						{{item.name}}
 					</view>
-					<view class="item1" style="width: 120rpx;font-size: 28rpx;margin-left:25rpx;">
+					<view class="item1" style="width: 120rpx;font-size: 28rpx;margin-left:30rpx;">
 						<text>{{item.status}}</text>
 					</view>
 
@@ -237,8 +238,9 @@ height: 140rpx;"></image>
 						再次邀约
 					</view>
 				</view>
-
-				<view class="pos" style="height:208rpx;">
+				<u-loadmore v-if="failList.length!=0" style="" status="false" nomoreText="已经到底啦" color="#CCCCCC"
+					lineColor="#CCCCCC" line />
+				<view class="pos" style="height:50rpx;">
 				</view>
 
 			</view>
@@ -1017,6 +1019,7 @@ height: 140rpx;"></image>
 					console.log('获取我的邀请返回值-成功: ', res2);
 
 					this.sucList = res2.data.data
+					// this.sucList = [...res2.data.data, ...res2.data.data, ...res2.data.data, ...res2.data.data]
 				} else {
 					uni.showToast({
 						title: res2.message,

pages/my/sellAfterCon/index.vue

@@ -81,7 +81,7 @@
 									扫码了解
 								</view>
 								<image class="code" :src="picBase+con.wxCode" mode=""
-									style="width: 100%;height: 250rpx;">
+									style="width: 100%;height: 250rpx;" @click="previewImg()">
 								</image>
 							</view>
 						</view>
@@ -136,6 +136,15 @@
 					phoneNumber: phone,
 				})
 			},
+			//点击预览图片 
+			previewImg() {
+				uni.previewImage({
+					current: this.picBase + this.con.wxCode,
+					urls: [this.picBase + this.con.wxCode], //存放图片的数组
+					loop: true,
+					indicator: 'default'
+				})
+			},
 		}
 	}
 </script>

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>jiancaiPro</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.1f39b4d6.js></script><script src=/static/js/index.6e3acb6c.js></script></body></html>

unpackage/dist/build/h5/static/customicons.css

@@ -0,0 +1,20 @@
+@font-face {
+  font-family: "customicons"; /* Project id 2878519 */
+  src:url('/static/customicons.ttf') format('truetype');
+}
+
+.customicons {
+  font-family: "customicons" !important;
+}
+
+.youxi:before {
+  content: "\e60e";
+}
+
+.wenjian:before {
+  content: "\e60f";
+}
+
+.zhuanfa:before {
+  content: "\e610";
+}

unpackage/dist/build/h5/static/js/pages-my-test-index.418b5b20.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-my-test-index"],{"115a":function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var a=function(){var t=this.$createElement,n=this._self._c||t;return n("v-uni-view",{staticClass:"page"},[n("navBar",{attrs:{title:"测试",back:!0,color:"black",background:"white"}})],1)},u=[]},1485:function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={components:{},data:function(){return{}},onLoad:function(t){},methods:{}}},"25e6":function(t,n,e){var a=e("ce43");a.__esModule&&(a=a.default),"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var u=e("4f06").default;u("005215a6",a,!0,{sourceMap:!1,shadowMode:!1})},6595:function(t,n,e){"use strict";e.r(n);var a=e("1485"),u=e.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);n["default"]=u.a},"79b2":function(t,n,e){"use strict";e.r(n);var a=e("115a"),u=e("6595");for(var o in u)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(o);e("7e841");var r=e("f0c5"),c=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"c5b61fee",null,!1,a["a"],void 0);n["default"]=c.exports},"7e841":function(t,n,e){"use strict";var a=e("25e6"),u=e.n(a);u.a},ce43:function(t,n,e){var a=e("24fb");n=a(!1),n.push([t.i,'@charset "UTF-8";\n/* 水平间距 */\n/* 水平间距 */',""]),t.exports=n}}]);