分享及分包

Signed-off-by: wangxiaoping <809126545@qq.com>

main.js

@@ -62,7 +62,7 @@ Vue.prototype.reqByToken = (url, params, cb, method) => {
 				cb(r.data.data)
 			} else if (r.data.status === 2) {
 				uni.navigateTo({
-					url: '/pages/login/index'
+					url: '/package/pages/login/index'
 				})
 				return false
 			} else {

manifest.json

@@ -59,7 +59,10 @@
             "scope.userLocation" : {
                 "desc" : "提供LBS服务"
             }
-        }
+        },
+		"optimization":{
+			"subPackages":true
+		}
     },
     "mp-alipay" : {
         "usingComponents" : true

package/pages/buyMember/buyMember.vue

@@ -38,6 +38,7 @@
 </template>
 
 <script>
+	import {weixin} from '../../../utils/weixin.js'
 	export default {
 		data() {
 			const currentDate = this.getDate({
@@ -49,12 +50,17 @@
 					token: '',
 					phone: '',
 					productId: '',
-				}
+				},
+				token: '',
+				openid: '',
 			}
 		},
 		onLoad() {
 			const phone_token = uni.getStorageSync('phone_token')
 			this.info.phone = phone_token.phone
+			this.token = phone_token.token
+			let user_info = weixin.getUserInfoCache()
+			this.openid = user_info.openid
 		},
 		methods: {
 			pay() {
@@ -68,7 +74,28 @@
 				}
 				
 				this.reqByToken('/api/member/order-add', this.info, r => {
-					console.log(r)
+					uni.request({
+						url: this.baseUrl + '/api/member/order-payment',
+						method: 'GET',
+						data: {
+							token: this.token,
+							order_id: r.id,
+							openid: this.openid
+						},
+						success: res => {
+							let payParams = JSON.parse(res.data.jsApiParameters)
+							payParams.provider = 'wxpay'
+							payParams.success = result => {
+								uni.navigateTo({
+									url: '../../../pages/active/active'
+								})
+							}
+							payParams.fail = result => {
+								console.log(result);
+							}
+							wx.requestPayment(payParams);
+						}
+					})
 				})
 			},
 			bindDateChange: function(e) {

package/pages/login/index.vue

@@ -1,14 +1,13 @@
-<template>
-	<view class="content">
-		<image class="logo" src="../../static/logo@3x.png"></image>
-		
-		<!-- <button v-show="!hasProfile" @click="getUserProfile">微信用户一键登录</button> -->
-		<button v-show="hasProfile" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权手机号</button>
-	</view>
-</template>
-
+<template>
+	<view class="content">
+		<image class="logo" src="../../static/logo@3x.png"></image>
+		
+		<!-- <button v-show="!hasProfile" @click="getUserProfile">微信用户一键登录</button> -->
+		<button v-show="hasProfile" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权手机号</button>
+	</view>
+</template>
 <script>
-	import {weixin} from '../../utils/weixin.js';
+	import {weixin} from '../../../utils/weixin.js';
 	export default {
 		data(){
 			return{
@@ -30,7 +29,7 @@
 		  },
 		  getPhoneNumber(e) {
 			if (e.detail.iv) {
-			  weixin.getOpenidInfo(user_info => {
+			  weixin.getOpenidInfo(user_info => {
 				  uni.request({
 					url: this.baseUrl + '/api/member/get-phone-by-openid',
 					method: 'POST',
@@ -64,27 +63,27 @@
 		  }
 		}
 	}
-</script>
-
-<style lang="scss">
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-	.logo{
-		display: block;
-		width:250rpx;
-		height:250rpx;
-		margin:100rpx auto 0 auto;
-	}
-	.title{
-		display: block;
-		width:333rpx;
-		height:44rpx;
-		margin:40rpx auto 110rpx auto;
-	}	
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+	.logo{
+		display: block;
+		width:250rpx;
+		height:250rpx;
+		margin:100rpx auto 0 auto;
+	}
+	.title{
+		display: block;
+		width:333rpx;
+		height:44rpx;
+		margin:40rpx auto 110rpx auto;
+	}	
 	button{
 		width: 520rpx;
 		height: 90rpx;
@@ -93,12 +92,12 @@
 		line-height:90rpx;
 		font-weight: bold;
 		color: #FFFFFF;	
-		margin-top:35rpx;
+		margin-top:35rpx;
 		border-radius:45rpx;
 		vertical-align: middle;
 	}
 	button:active{
 		background: #FF578A;
 		color: #FFFFFF;	
-	}
+	}
 </style>

pages.json

@@ -1,29 +1,13 @@
 {
 	"pages": [
-		{
-			"path": "pages/member/member",
-			"style": {
-				"navigationBarTitleText": "加入会员",
-				"navigationBarBackgroundColor":"#fff",
-				"navigationBarTextStyle": "black"
-				
-			}			
-		},
-		{
-			"path": "pages/applyReg/applyReg",
-			"style": {
-				"navigationBarTitleText": "推广人员注册",
-				"navigationBarBackgroundColor":"#fff",
-				"navigationBarTextStyle": "black"
-			}			
-		},
-		{
-			"path": "pages/login/index",
-			"style": {
-				"navigationBarTitleText": "登录授权",
-				"navigationBarBackgroundColor":"#fff",
-				"navigationBarTextStyle": "black"
-			}			
+		{
+			"path": "pages/member/member",
+			"style": {
+				"navigationBarTitleText": "加入会员",
+				"navigationBarBackgroundColor":"#fff",
+				"navigationBarTextStyle": "black"
+				
+			}			
 		},
 		{
 			"path": "pages/active/active",
@@ -32,15 +16,6 @@
 				"navigationBarBackgroundColor":"#FF578A",
 				"navigationBarTextStyle": "white"
 				
-			}			
-		},		
-		{
-			"path": "pages/buyMember/buyMember",
-			"style": {
-				"navigationBarTitleText": "购买会员",
-				"navigationBarBackgroundColor":"#fff",
-				"navigationBarTextStyle": "black"
-				
 			}			
 		},			
 	
@@ -237,7 +212,38 @@
             }
             
         }
-    ],
+    ],
+	"subPackages": [{
+		"root" : "package",
+		"pages":[
+		{
+			"path": "pages/applyReg/applyReg",
+			"style": {
+				"navigationBarTitleText": "推广人员注册",
+				"navigationBarBackgroundColor":"#fff",
+				"navigationBarTextStyle": "black"
+			}			
+		},
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录授权",
+				"navigationBarBackgroundColor":"#fff",
+				"navigationBarTextStyle": "black"
+			}			
+		},
+	
+		{
+			"path": "pages/buyMember/buyMember",
+			"style": {
+				"navigationBarTitleText": "购买会员",
+				"navigationBarBackgroundColor":"#fff",
+				"navigationBarTextStyle": "black"
+				
+			}			
+		}		
+		]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "优孕课堂",

pages/member/member.vue

@@ -1,13 +1,19 @@
 <template>
 	<view class="content">
 		<view class="memberBanner">
-			<image mode="widthFix" src="../../static/1_01.jpg"></image>
+			<image mode="widthFix" src="../../static/member_01.jpg"></image>
 		</view>
 		<view class="memberBanner">
-			<image mode="widthFix" src="../../static/1_02.jpg"></image>
+			<image mode="widthFix" src="../../static/member_02.jpg"></image>
+		</view>
+		<view class="memberBanner">
+			<image mode="widthFix" src="../../static/member_03.jpg"></image>
+		</view>
+		<view class="memberBanner">
+			<image mode="widthFix" src="../../static/member_04.jpg"></image>
 		</view>
 		<view class="joinBox" @click="open"><button>加入会员</button></view>
-		<view class="shareIcon" @click="shareOpen">
+		<view class="shareIcon" @click="shareOpen" v-if="user_info.promotion == 1">
 			<image src="../../static/share.png"></image>
 		</view>
 		<uni-popup ref="popup" :mask-click="false" type="bottom" class="popBox">
@@ -33,35 +39,98 @@
 		</uni-popup>
 		<uni-popup ref="shareCode" :mask-click="true" type="bottom" class="shareBox">
 			<view class="codeOuter">
-				<view class="shareCon">
-					<image class="shareBg" mode="widthFix" src="../../static/bg_haibao@2x.png"></image>
-					<image class="code" src="../../static/300_qr.png"></image>
+				<view class="shareCon" @click="shareClose">
+					<canvas style="width:100%;" :style="{ height: (cropperH-50) + 'px' }" canvas-id="firstCanvas" id="firstCanvas"></canvas>
+					<!-- <image class="shareBg" mode="widthFix" src="../../static/bg_haibao@2x.png"></image> -->
+					<!-- <image class="code" src="../../static/300_qr.png"></image> -->
 				</view>
-				<view class="shareBott">
-					<view class="shareCol" @click="shareClose">发给朋友</view>
-					<view class="shareCol" @click="shareClose">保存相册</view>
+				<view class="shareBott" :style="{display: shareBtnDisplay}">
+					<button class="shareCol" @click="shareClose" open-type="share" style="border-radius:0;flex:1;">发给朋友</button>
+					<button class="shareCol" @click="save" style="border-radius:0;flex:1;">保存相册</button>
 				</view>
 			</view>
-		</uni-popup>
+		</uni-popup>
+		
 	</view>
 </template>
 
 <script>
+	let sysInfo = uni.getSystemInfoSync();
+	let SCREEN_WIDTH = sysInfo.screenWidth
+	let SCREEN_HEIGHT = sysInfo.screenHeight
 	import {
 		weixin
 	} from '../../utils/weixin.js';
 	export default {
 		data() {
 			return {
-				cardActive: 0
+				cardActive: 0,
+				img: '',
+				user_info: {
+					promotion: ''
+				},
+				shareBtnDisplay: 'none',
+				// 动态的宽高
+				cropperW: SCREEN_WIDTH,
+				cropperH: SCREEN_HEIGHT,				
 			}
 		},
-		onLoad() {
-
-		},
+		onLoad() {
+			weixin.getOpenidInfo(info => {
+				this.user_info = info
+			})
+		},
+		onShareAppMessage() {
+		    return {
+		      title: '加入会员',
+		      path: 'pages/member/member?promotion_id=' + this.user_info.id,
+			  imageUrl: this.img
+		    }
+		},
 		methods: {
-			shareOpen() {
-				this.$refs.shareCode.open()
+			shareOpen() {
+				uni.showLoading({
+				    title: '加载中'
+				});
+				this.$refs.shareCode.open()
+				uni.request({
+					url: this.baseUrl + '/api/member/get-wxa-qrcode',
+					method: 'GET',
+					data: {
+						path: '',
+						scene: this.user_info.id
+					},
+					success: r => {
+						if (r.data.status === 1) {
+						  uni.getImageInfo({
+							  src: this.baseUrl + r.data.data, // 二维码
+							  success: res => {
+								  let ctx = uni.createCanvasContext('firstCanvas')
+								  // ctx.fillStyle = '#fff';
+								  // ctx.fillRect(0, 0, 214, 342);
+								  ctx.drawImage('../../static/shareBg.png', SCREEN_WIDTH*0.1, (SCREEN_HEIGHT-50-SCREEN_WIDTH*0.8*1.65)/2, SCREEN_WIDTH*0.8,SCREEN_WIDTH*0.8*1.5);
+								  ctx.drawImage(res.path, SCREEN_WIDTH*0.62, (SCREEN_HEIGHT-50-SCREEN_WIDTH*0.8*1.5)/2+SCREEN_WIDTH*0.8*1.02, SCREEN_WIDTH*0.2, SCREEN_WIDTH*0.2,);
+								  ctx.draw()
+								  setTimeout(()=>{
+								    uni.canvasToTempFilePath({
+										canvasId: 'firstCanvas',
+										fileType: 'jpg',
+										success: (res) => {
+										 this.shareBtnDisplay = 'flex'
+										 uni.hideLoading()
+										 this.img = res.tempFilePath
+										},
+								   })
+								  },100)
+							  }
+						  })
+						} else {
+							uni.hideLoading()
+							this.$refs.shareCode.close()
+							this.alert(r.data.msg)
+						}
+					}
+				})
 			},
 			shareClose() {
 				this.$refs.shareCode.close()
@@ -76,10 +145,28 @@
 				if (this.checkLogin()) {
 					this.$refs.popup.close()
 					uni.navigateTo({
-						url: "../buyMember/buyMember"
+						url: "../../package/pages/buyMember/buyMember"
 					});
 				}
-			},
+			},
+			//保存图片时，h5端不能直接保存，只能通过预览长按保存
+			save() {
+				let _this = this;
+				// #ifdef H5
+				uni.previewImage({
+				 urls: [_this.img]
+				})
+				// #endif
+				// #ifdef APP-PLUS||MP-WEIXIN
+				uni.saveImageToPhotosAlbum({
+				 filePath: _this.img,
+				 success: function() {
+					 _this.$refs.shareCode.close()
+					 _this.alert('保存成功')
+				 }
+				});
+				// #endif
+			},
 		}
 	}
 </script>
@@ -234,15 +321,18 @@
 		width: 100%;
 		height: 100vh;
 		background: rgba(0, 0, 0, 0.5);
-		padding-top: 13vh;
+		// padding-top: 13vh;
 		box-sizing: border-box;
 		position: relative;
 	}
 
 	.shareCon {
-		width: 500rpx;
-		margin: 0 auto;
-		position: relative;
+		// width: 500rpx;
+		// margin: 0 auto;
+		//position: absolute;
+		//top: 45%;
+		//left: 50%;
+		// transform: translate(-50%, -50%);
 
 		.code {
 			width: 300rpx;

project.config.json

@@ -0,0 +1,67 @@
+{
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "bundle": false,
+    "userConfirmedBundleSwitch": false,
+    "urlCheck": true,
+    "scopeDataCheck": false,
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "compileHotReLoad": false,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "autoAudits": false,
+    "newFeature": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "useIsolateContext": true,
+    "nodeModules": false,
+    "enhance": true,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmManually": false,
+    "enableEngineNative": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "showES6CompileOption": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.19.0",
+  "appid": "wx9b4762770771d98a",
+  "projectname": "miniprogram-1",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "staticServerOptions": {
+    "baseURL": "",
+    "servePath": ""
+  },
+  "isGameTourist": false,
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
+    }
+  }
+}

utils/weixin.js

@@ -26,7 +26,7 @@ export const weixin = {
 			const user_info1 = result.data.data.user_info
 			user_info1.openid = user_info1.wechat_openid
             uni.setStorageSync(user_info_key, user_info1)
-            cb(result.data.data.user_info)
+            cb(user_info1)
           }
         });
        }