111

.gitignore

@@ -1,3 +1,2 @@
 .DS_Store
 node_modules
-unpackage

main.js

@@ -18,11 +18,14 @@ Vue.component('order-goods',orderGoods)
 Vue.component('dynamics',dynamics)
 Vue.component('large-image-list',largeImageList)
 
-
+// 测试
 Vue.prototype.BASE_URL = "https://testapi.reecook.cn"
+Vue.prototype.IMAGE_URL = "https://testcdn.reecook.cn/static"
+
+// 正式
 // Vue.prototype.BASE_URL = "https://api.reecook.cn"
 // Vue.prototype.IMAGE_URL = "https://cdn.reecook.cn/static"
-Vue.prototype.IMAGE_URL = "https://testcdn.reecook.cn/static"
+
 
 
 

package-lock.json

@@ -1,11 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "wxmp-rsa": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/wxmp-rsa/-/wxmp-rsa-1.1.0.tgz",
-      "integrity": "sha512-1Cheo+Q0iFD74Jd7Ox3HNvV36f7YTHe/2Bxnvuex8OibdCO33MZgwGVWX79acMa2YKNv3KISXr6QInWRG47edQ=="
-    }
-  }
-}

package.json

@@ -0,0 +1,19 @@
+{
+  "name": "recook-weapp",
+  "version": "1.0.0",
+  "description": "",
+  "main": "main.js",
+  "dependencies": {
+    "wxmp-rsa": "^1.1.0"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@192.168.2.201:xiajinyu/recook-weapp.git"
+  },
+  "author": "",
+  "license": "ISC"
+}

pages/cart/cart.vue

@@ -21,7 +21,7 @@
 							<view class="flex align-center" style="height: 200rpx;">
 								<text :class="goods.goodsChecked?'cuIcon-roundcheckfill text-red':'cuIcon-round text-gray'" @tap="checkGoods(shopIndex,goodsIndex)"></text>
 							</view>
-							<navigator :url="'/packageA/goodsDetail/goodsDetail?id='+goods.goodsId" class="cart-goods-pic bg-img" :style="'background-image: url('+ IMAGE_URL+goods.mainPhotoUrl+');'"></navigator>
+							<navigator :url="'/pages/goodsDetail/goodsDetail?id='+goods.goodsId" class="cart-goods-pic bg-img" :style="'background-image: url('+ IMAGE_URL+goods.mainPhotoUrl+');'"></navigator>
 							<view class="cart-goods-msg flex-sub">
 								<view class="msg-top flex flex-direction justify-between clear align-start">
 									<view class="">

pages/goodsDetail/goodsDetail.vue

@@ -27,8 +27,7 @@
 									<view class="dots-box"><text style="font-size: 32rpx;">{{current+1}}</text>/{{goodsDetail.mainPhotos.length}}</view>
 								</view>
 
-								<view class="banner-con">
-									<image :src="IMAGE_URL+'/photo/FhNoUtBF0LtApK3LnX9k6RE9FK5v.png'" style="width: 100%;" mode="widthFix"></image>
+								<view class="banner-con bg-img" :style="'background-image: url('+IMAGE_URL+'/photo/FhNoUtBF0LtApK3LnX9k6RE9FK5v.png);'">
 									<view class="pic-con">
 										<view class="flex quan-top">
 											<view class="quan">20元优惠券</view>
@@ -648,7 +647,8 @@
 	.banner-con {
 		position: relative;
 		margin-top: -80rpx;
-
+		height: 212rpx;
+		background-color: transparent;
 		.pic-con {
 			position: absolute;
 			bottom: 20rpx;

pages/makeDynamic/makeDynamic.vue

@@ -11,7 +11,7 @@
 				<view class="">(最多{{maxLength}}张)</view>
 			</view>
 		</view>
-		<view class="padding">
+		<view class="" style="padding: 25rpx;">
 			<button class="bg-red text-white" @tap="submit">发布</button>
 		</view>
 	</view>
@@ -23,7 +23,7 @@
 			return {
 				IMAGE_URL: this.IMAGE_URL,
 				images: [],
-				maxLength: 5,
+				maxLength: 9,
 				goodsId: 0,
 				content: ""
 			};
@@ -124,8 +124,8 @@
 
 <style lang="scss">
 	.placeholder {
-		padding: 25rpx;
-		margin: 20rpx;
+		padding: 22rpx;
+		margin: 25rpx;
 		width: 700rpx;
 		line-height: 40rpx;
 	}
@@ -134,15 +134,15 @@
 		margin: 25rpx;
 
 		&>view {
-			width: 128rpx;
-			height: 128rpx;
+			width: 160rpx;
+			height: 160rpx;
 			border-radius: 10rpx;
-			margin-right: 15rpx;
-			margin-bottom: 15rpx;
+			margin-right: 20rpx;
+			margin-bottom: 20rpx;
 			font-size: 20rpx;
 			color: #AAAAAA;
 
-			&:nth-child(5n) {
+			&:nth-child(4n) {
 				margin-right: 0;
 			}
 		}
@@ -150,6 +150,7 @@
 		.upload {
 			border: 1rpx solid #DDDDDD;
 			box-sizing: border-box;
+			background-color: #FFFFFF;
 		}
 
 		.image-item {

pages/returnGoods/returnGoods.vue

@@ -143,7 +143,7 @@
 			},
 			chooseImage() {
 				uni.chooseImage({
-					count: this.maxLength, //默认9
+					count: this.maxLength-this.images.length, 
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					success: (res) => {
 						console.log(res.tempFilePaths);