Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/pages/product/productAdd/index.vue

@@ -1944,6 +1944,9 @@ export default {
               this.formValidate.spec_type = this.spec_type;
               this.$Message.error(res.msg);
             });
+          if (this.formValidate.spec_type == 1) {
+            this.generate(1);
+          }
         }
       }
       switch (index) {

template/admin/src/pages/setting/systemMenus/components/menusFrom.vue

@@ -403,7 +403,6 @@ export default {
         }
       }
       this.valids = true;
-      data.datas.menu_path = this.$routeProStr + this.formValidate.menu_path
       addMenusApi(data)
         .then(async (res) => {
           this.$Message.success(res.msg);

template/uni-app/components/shareRedPackets/index.vue

@@ -1,152 +1,158 @@
-<template>
-	<view v-if="sharePacket.isState" class='sharing-packets' :class='sharePacket.isState && showAnimate ? "":"right"'>
-		<view class='sharing-con' @click='goShare'>
-			<image :src="imgHost + '/statics/images/red-packets.png'" />
-			<view class='text font-color'>
-				<view>{{$t(`最高返佣`)}}</view>
-				<view class='money'><text class='label'>{{$t(`￥`)}}</text>{{sharePacket.priceName}}</view>
-				<view class='tip'>{{$t(`推广享佣金`)}}</view>
-				<view class='shareBut'>{{$t(`立即分享`)}}</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {HTTP_REQUEST_URL} from '@/config/app';
-	export default {
-
-		props: {
-			sharePacket: {
-				type: Object,
-				default: function() {
-					return {
-						isState: true,
-						priceName: ''
-					}
-				}
-			},
-			showAnimate: {
-				type: Boolean,
-				default: true
-			},
-		},
-		watch: {
-			showAnimate(nVal, oVal) {
-				setTimeout(res => {
-					this.isAnimate = nVal
-				}, 1000)
-			}
-		},
-		data() {
-			return {
-				imgHost:HTTP_REQUEST_URL,
-				isAnimate: true
-			};
-		},
-
-		methods: {
-			closeShare: function() {
-				this.$emit('closeChange');
-			},
-			goShare: function() {
-				if (this.isAnimate) {
-					this.$emit('listenerActionSheet');
-				} else {
-					this.isAnimate = true
-					this.$emit('boxStatus', true);
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.sharing-packets {
-		position: fixed;
-		left: 30rpx;
-		bottom: 200rpx;
-		z-index: 5;
-		transition: all 0.3s ease-in-out 0s;
-		opacity: 1;
-		transform: scale(1);
-
-		&.right {
-			left: -170rpx;
-		}
-	}
-
-	// .sharing-packets.on {
-	// 	transform: scale(0);
-	// 	opacity: 0;
-	// }
-
-	.sharing-packets .iconfont {
-		width: 44rpx;
-		height: 44rpx;
-		border-radius: 50%;
-		text-align: center;
-		line-height: 44rpx;
-		background-color: #999;
-		font-size: 20rpx;
-		color: #fff;
-		margin: 0 auto;
-		box-sizing: border-box;
-		padding-left: 1px;
-	}
-
-	.sharing-packets .line {
-		width: 2rpx;
-		height: 40rpx;
-		background-color: #999;
-		margin: 0 auto;
-	}
-
-	.sharing-packets .sharing-con {
-		width: 187rpx;
-		height: 210rpx;
-		position: relative;
-	}
-
-	.sharing-packets .sharing-con image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.sharing-packets .sharing-con .text {
-		position: absolute;
-		top: 30rpx;
-		font-size: 20rpx;
-		width: 100%;
-		text-align: center;
-	}
-
-	.sharing-packets .sharing-con .text .money {
+<template>
+	<view v-if="sharePacket.isState" class='sharing-packets' :class='sharePacket.isState && showAnimate ? "":"right"'>
+		<view class='sharing-con' @click='goShare'>
+			<image :src="imgHost + '/statics/images/red-packets.png'" />
+			<view class='text font-color'>
+				<view>{{$t(`最高返佣`)}}</view>
+				<view class='money'><text class='label'>{{$t(`￥`)}}</text>{{sharePacket.priceName}}</view>
+				<view class='tip'>{{$t(`推广享佣金`)}}</view>
+				<view class='shareBut'>{{$t(`立即分享`)}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	export default {
+
+		props: {
+			sharePacket: {
+				type: Object,
+				default: function() {
+					return {
+						isState: true,
+						priceName: ''
+					}
+				}
+			},
+			showAnimate: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+			showAnimate(nVal, oVal) {
+				setTimeout(res => {
+					this.isAnimate = nVal
+				}, 1000)
+			}
+		},
+		data() {
+			return {
+				imgHost: HTTP_REQUEST_URL,
+				isAnimate: true
+			};
+		},
+
+		methods: {
+			closeShare: function() {
+				this.$emit('closeChange');
+			},
+			goShare: function() {
+				if (this.isAnimate) {
+					this.$emit('listenerActionSheet');
+				} else {
+					this.isAnimate = true
+					this.$emit('boxStatus', true);
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.sharing-packets {
+		position: fixed;
+		left: 30rpx;
+		bottom: 200rpx;
+		z-index: 5;
+		transition: all 0.3s ease-in-out 0s;
+		opacity: 1;
+		transform: scale(1);
+
+		&.right {
+			left: -170rpx;
+		}
+	}
+
+	// .sharing-packets.on {
+	// 	transform: scale(0);
+	// 	opacity: 0;
+	// }
+
+	.sharing-packets .iconfont {
+		width: 44rpx;
+		height: 44rpx;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 44rpx;
+		background-color: #999;
+		font-size: 20rpx;
+		color: #fff;
+		margin: 0 auto;
+		box-sizing: border-box;
+		padding-left: 1px;
+	}
+
+	.sharing-packets .line {
+		width: 2rpx;
+		height: 40rpx;
+		background-color: #999;
+		margin: 0 auto;
+	}
+
+	.sharing-packets .sharing-con {
+		width: 187rpx;
+		height: 210rpx;
+		position: relative;
+	}
+
+	.sharing-packets .sharing-con image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.sharing-packets .sharing-con .text {
+		position: absolute;
+		top: 30rpx;
+		font-size: 20rpx;
+		line-height: 30rpx;
+		width: 100%;
+		text-align: center;
+	}
+
+	.sharing-packets .sharing-con .text .money {
 		font-size: 32rpx;
-		font-weight: bold;
-		margin-top: 5rpx;
-	}
-
-	.sharing-packets .sharing-con .text .money .label {
-		font-size: 20rpx;
-	}
-
-	.sharing-packets .sharing-con .text .tip {
+		line-height: 42rpx;
+		font-weight: bold;
+		margin-top: 5rpx;
+	}
+
+	.sharing-packets .sharing-con .text .money .label {
+		font-size: 20rpx;
+	}
+
+	.sharing-packets .sharing-con .text .tip {
 		font-size: 18rpx;
-		color: #999;
-		margin-top: 5rpx;
-	}
-
-	.sharing-packets .sharing-con .text .shareBut {
+		line-height: 18rpx;
+		color: #999;
+		margin-top: 5rpx;
+	}
+
+	.sharing-packets .sharing-con .text .shareBut {
 		font-size: 22rpx;
-		color: #fff;
-		// #ifdef H5
-		margin-top: 14rpx;
-		// #endif
-		// #ifndef H5
-		margin-top: 26rpx;
-		// #endif
-		height: 50rpx;
-		line-height: 50rpx;
-	}
+		line-height: 48rpx;
+		color: #fff;
+		/* #ifdef H5 */
+		margin-top: 28rpx;
+		/* #endif */
+
+		/* #ifndef H5 */
+		margin-top: 26rpx;
+		/* #endif */
+
+	}
 </style>

template/uni-app/manifest.json

@@ -173,7 +173,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1234567890",
+        "appid" : "wx3b82801238ca1b57",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

template/uni-app/pages/activity/poster-poster/index.vue

@@ -219,7 +219,6 @@
 			},
 			//图片转符合安全域名路径
 			downloadFilestoreImage(url) {
-				url = this.setDomain(url)
 				return new Promise((resolve, reject) => {
 					let that = this;
 					uni.downloadFile({

template/uni-app/pages/users/user_spread_code/index.vue

@@ -220,7 +220,7 @@
 					// #endif
 					// #ifdef APP-PLUS
 					img = await this.imgToBase(res.data.spread[i].pic, res.data.qrcode)
-					arr2 = [img.code || this.codeSrc, img.image]
+					arr2 = [this.codeSrc, img.image]
 					// #endif
 					that.$util.userPosterCanvas(arr2, res.data.nickname, res.data.site_name, i, this.wd, this.hg, (
 						tempFilePath) => {
@@ -247,6 +247,7 @@
 				this.mpUrl = res.data.url
 			},
 			async imgToBase(url, code) {
+				console.log(url, code);
 				let res = await imgToBase({
 					image: url,
 					code: code