Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu

# Conflicts:
#	pages.json
#	pages/store-home/main/main.vue
#	unpackage/dist/dev/mp-weixin/app.js
#	unpackage/dist/dev/mp-weixin/app.json

pages.json

@@ -1,5 +1,12 @@
 {
 	"pages": [
+		{
+			"path" : "pages/order/product-unpay/product-unpay",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
 	{
 		"path" : "pages/home/home/home",
 		"style" : 
@@ -44,6 +51,7 @@
 		}
 	},
 	{
+<<<<<<< HEAD
 		"path" : "pages/booking/AppointmentHome",
 		"style" : 
 		{
@@ -94,6 +102,9 @@
 	},
 	{
 		"path" : "pages/Shopping-cart/Phone/Phone",
+=======
+		"path" : "pages/order/product-close/product-close",
+>>>>>>> a89799158357dbed9a3c5e0c4bb1151cf2aecf1f
 		"style" : 
 		{
 			"navigationBarTitleText" : ""

pages/store-home/main/main.vue

@@ -58,10 +58,15 @@
 				<view class="flex-col shrink-0 pos">
 
 					<!-- <scroll-view style="height: 1000rpx;" scroll-y="true"> -->
+<<<<<<< HEAD
 
 					<view class="flex-row list-item mt-5" v-for="(item, index) in product_list" :key="index">
 
 						<navigator url="../../booking/ContactInformation">
+=======
+						<view class="flex-row list-item mt-5" v-for="(item, index) in product_list" :key="index">
+							
+>>>>>>> a89799158357dbed9a3c5e0c4bb1151cf2aecf1f
 							<image class="self-center image_4" :src="item.imgurl" />
 							
 							<view class="flex-col items-start self-center group_5">
@@ -76,8 +81,27 @@
 							
 							<image class="self-start image_5"
 								src="https://ide.code.fun/api/image?token=670c83a81511d900114a6d7e&name=806f54ff88b61d172a611e704c80a85c.png" />
+<<<<<<< HEAD
 							
 						</navigator>
+=======
+						
+						</view>
+					<!-- </scroll-view> -->
+				</view>
+			</view>
+			<!-- <view class="flex-col shrink-0 pos">
+				<scroll-view style="height: 1000rpx;" scroll-y="true">
+					<view class="flex-row list-item mt-5" v-for="(item, index) in product_list" :key="index">
+						<image class="self-center image_4" :src="item.imgurl" />
+						<view class="flex-col items-start self-center group_5">
+							<text class="font_2">{{ item.product_name }}</text>
+							<text class="font mt-13">{{ item.detail }}</text>
+							<text class="font_4 text_7 mt-13">￥{{ item.value }}</text>
+						</view> 
+						<image class="self-start image_5"
+							src="https://ide.code.fun/api/image?token=670c83a81511d900114a6d7e&name=806f54ff88b61d172a611e704c80a85c.png" />
+>>>>>>> a89799158357dbed9a3c5e0c4bb1151cf2aecf1f
 					</view>
 
 					<!-- </scroll-view> -->
@@ -340,7 +364,11 @@ src="https://ide.code.fun/api/image?token=670c83a81511d900114a6d7e&name=806f54ff
 	.section_5 {
 		padding: 18.06rpx 16.24rpx 14.94rpx;
 		background-color: #C1651A;
+<<<<<<< HEAD
 
+=======
+		
+>>>>>>> a89799158357dbed9a3c5e0c4bb1151cf2aecf1f
 		border-radius: 0rpx 18.75rpx 0rpx 0rpx;
 	}
 

unpackage/dist/dev/mp-weixin/app.js

@@ -2,16 +2,21 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common_vendor = require("./common/vendor.js");
 if (!Math) {
+  "./pages/order/product-unpay/product-unpay.js";
   "./pages/home/home/home.js";
   "./pages/store-home/main/main.js";
   "./pages/mine/main/main.js";
   "./pages/Shopping-cart/productmain/productmain.js";
   "./pages/store-home/products/product-detail.js";
   "./pages/Shopping-cart/servicemain/servicemain.js";
+<<<<<<< HEAD
   "./pages/booking/AppointmentHome.js";
   "./pages/booking/ContactInformation.js";
   "./pages/booking/date.js";
   "./pages/Shopping-cart/Phone/Phone.js";
+=======
+  "./pages/order/product-close/product-close.js";
+>>>>>>> a89799158357dbed9a3c5e0c4bb1151cf2aecf1f
 }
 const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {

unpackage/dist/dev/mp-weixin/app.json

@@ -1,11 +1,13 @@
 {
   "pages": [
+    "pages/order/product-unpay/product-unpay",
     "pages/home/home/home",
     "pages/store-home/main/main",
     "pages/mine/main/main",
     "pages/Shopping-cart/productmain/productmain",
     "pages/store-home/products/product-detail",
     "pages/Shopping-cart/servicemain/servicemain",
+<<<<<<< HEAD
     "pages/booking/AppointmentHome",
     "pages/booking/ContactInformation",
     "pages/booking/date",
@@ -14,6 +16,9 @@
     "pages/Shopping-cart/Contact",
     "pages/Shopping-cart/address",
     "pages/Shopping-cart/Phone/Phone"
+=======
+    "pages/order/product-close/product-close"
+>>>>>>> a89799158357dbed9a3c5e0c4bb1151cf2aecf1f
   ],
   "window": {
     "navigationBarTextStyle": "black",