Merge remote-tracking branch 'remotes/origin/zhoucong' into develop

main.js

@@ -10,13 +10,6 @@ Vue.prototype.$commonjs = commonjs
 Vue.prototype.$request = request
 Vue.use(uView)
 
-
-if(process.env.NODE_ENV === 'development'){//开发环境
-    Vue.prototype.imgUrl = "http://picture.tuyoyoo.com/"
-}else{
-    Vue.prototype.imgUrl = "http://picture.pangdly.com/"
-}
-
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({

pages/vlog/components/dragImg/dragImg.vue

@@ -10,7 +10,7 @@
 				<!-- start:请在该区域编写自己的渲染逻辑 -->
 				<view class="info">
 					<view class="info__item">
-						<image class="image" :src="$imgUrl+item.data.images" mode="widthFix"></image>
+						<image class="image" :src="'http://picture.pangdly.com/'+item.data.images" mode="widthFix"></image>
 					</view>
 					<view class="info__item_btn" @click.stop="replace(item)">
 						更换
@@ -64,7 +64,6 @@
 				overOnePage: false, // 整个区域是否超过一个屏幕
 				itemTransition: false, // item 变换是否需要过渡动画, 首次渲染不需要
 				platform: "", //使用平台
-				$imgUrl:""//图片前缀
 			}
 		},
 		watch: {
@@ -74,7 +73,6 @@
 			},
 		},
 		onReady() {
-			this.$imgUrl=this.imgUrl//因main.js挂载的全局变量页面中显示undifined,特此重新赋值
 			this.init()
 		},
 		methods: {
@@ -353,11 +351,11 @@
 			},
 			//点击每一项后触发事件
 			itemClick(index, src) {
-				let urls = []
-				urls.push(src)
-				uni.previewImage({//点击查看大图
-					urls: urls,
-				})
+				// let urls = []
+				// urls.push(src)
+				// uni.previewImage({//点击查看大图
+				// 	urls: 'http://picture.pangdly.com/'+ urls,
+				// })
 				// let item = this.list[index]
 				// this.$emit('click', {
 				// 	oldKey: index,

pages/vlog/orderPay/orderPay.vue

@@ -14,8 +14,7 @@
 			</view>
 			<u-icon name="arrow-right" class="icon" color="#666666"></u-icon>
 		</view>
-		<image src="../../../static/img/vlog/icon/fengexian.png" mode=""
-			style="width: 110%;height: 10upx;margin-left: -20upx;"></image>
+		<image src="../../../static/img/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 5upx;"></image>
 		<view class="body">
 			<image :src="productVo.priceStockList[0].imgList[0].url"></image>
 			<view class="title">

pages/vlog/productDetails/productDetails.vue

@@ -16,7 +16,7 @@
 				<u-section title="模板选择" :right="false" color="#303133"></u-section>
 				<text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Template Selection</text>
 			</view>
-			<image src="../../../static/img/vlog/icon/fengexian.png" style="width: 100%;height: 15rpx;"></image>
+			<image src="../../../static/img/vlog/icon/fengexian.png" style="width: 100%;height: 5rpx;"></image>
 			<view style="display: flex;justify-content: space-around;margin-bottom: 20upx;width: 75%;margin: 20upx auto;">
 				<button type="default" class="btnn" :class="current===0?'active':'noactive'"
 					@click="current=0">封面</button>
@@ -43,7 +43,7 @@
 				<u-section title="详细参数" :right="false" color="#303133"></u-section>
 				<text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Parameters</text>
 			</view>
-			<image src="../../../static/img/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 15rpx;"></image>
+			<image src="../../../static/img/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 5rpx;"></image>
 			<image :src="item.url" mode="widthFix" v-for="(item,index) in imgList1" :key="index" style="width: 100%;border-radius: 10rpx;"></image>
 			<view class="bottom" @click="beginMaking">上传照片制作</view>
 		</view>
@@ -246,7 +246,7 @@
 			height: 98rpx;
 			background-color: #FFE600;
 			right: 0;
-			line-height: 100rpx;
+			line-height: 98rpx;
 			font-size: 36rpx;
 			font-weight: bold;
 			border-top-left-radius: 10rpx;

pages/vlog/uploadPictures/uploadPictures.vue

 <template>
 	<view class="content">
-		<view class="top">
+		<view class="top" style="border-bottom: 1rpx dashed #ccc;">
 			<view class="upload" @click="chooseAvatar">
 				<u-icon class="icon" name="plus-circle" size="80" color="#999999"></u-icon>
 			</view>
@@ -8,11 +8,11 @@
 				已选{{checkList.length}}/{{maxImg}}
 			</view>
 		</view>
-		<view style="border: 1rpx dashed #ccc;opacity: 0.3;margin-top: 230rpx;"></view>
-		<view class="img">
+		<!-- <view style="border: 1rpx dashed #ccc;opacity: 0.3;margin-top: 230rpx;"></view> -->
+		<view class="img" style="margin-top: 230rpx;">
 			<block v-for="(item,index) in imgList" :key="index">
 				<view class="imgItem" @click="changeImg(item,index)">
-					<image :src="$imgUrl+item.url"></image>
+					<image :src="'http://picture.pangdly.com/'+item.url"></image>
 					<image v-if="item.check===1" src="../../../static/img/vlog/icon/check.png" class="icon"></image>
 				</view>
 			</block>
@@ -35,12 +35,9 @@
 				maxImg: "", //相册规格张数
 				imgList: [], //上传的图片列表
 				checkList: [], //选中的图片下标
-				$imgUrl:""
 			}
 		},
 		onLoad(opction) { //代替 vue 里面的 created
-			this.$imgUrl=this.imgUrl//因main.js挂载的全局变量页面中显示undifined,特此重新赋值
-			
 			this.maxImg = opction.yeshu //获取相册规格
 
 			this.imgList = uni.getStorageSync("imgList")
@@ -182,8 +179,9 @@
 			background-color: #fff;
 			width: 100%;
 			padding-bottom: 20rpx;
-
+			right: 0;
 			.upload {
+				margin-left: 20upx;
 				height: 200rpx;
 				width: 200rpx;
 				border-radius: 20rpx;
@@ -238,8 +236,8 @@
 			position: fixed;
 			bottom: 0;
 			width: 100%;
-			height: 80rpx;
-			line-height: 80rpx;
+			height: 98rpx;
+			line-height: 98rpx;
 			right: 0;
 			display: flex;
 			justify-content: space-around;
@@ -247,10 +245,11 @@
 			align-items: center;
 
 			view {
+				font-size: 32upx;
 				width: 35%;
 				border-radius: 10rpx;
-				height: 60rpx;
-				line-height: 60rpx;
+				height: 64rpx;
+				line-height: 64rpx;
 			}
 
 			.del {