Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

manifest.json

@@ -69,7 +69,7 @@
                 },
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wx928648edf0df1882",
+                        "appid" : "wx8cdd28824dfcdf19",
                         "UniversalLinks" : ""
                     }
                 },
@@ -86,7 +86,7 @@
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx928648edf0df1882",
+                        "appid" : "wx8cdd28824dfcdf19",
                         "UniversalLinks" : ""
                     }
                 }

pages/home/index.vue

@@ -186,7 +186,8 @@
 					that.search();
 					uni.hideLoading();
 				} else uni.showToast({
-					title: '没有更多数据了'
+					title: '没有更多数据了',
+					icon:'none'
 				});
 			},
 			// 计算高度

pagesHome/activity/index.vue

@@ -33,34 +33,14 @@
 	export default {
 		data() {
 			return {
-				oneUrl: require('@/static/test.png'),
+				oneUrl: '',
 				list: [ //
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-				]
+					// {
+					// 	url: '',
+					// 	name: '商品名称',
+					// 	money: 100,
+					// },
+          ]
 			};
 		},
 		onShow: function() {},

pagesHome/farming/index.vue

@@ -107,35 +107,15 @@
 						name: '店铺简介'
 					}
 				],
-				oneUrl: require('@/static/test.png'),
+				oneUrl:'',
 				info: {
-					url: require('@/static/test.png'),
+					url: '',
 					name: '首农食品旗舰店',
 					money: 100,
 				},
 				list: [ //
 					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
+						url: '',
 						name: '商品名称',
 						money: 100,
 					},

pagesHome/import/index.vue

@@ -1,157 +1,141 @@
 <template>
-	<mobile-frame>
-		<view class="main">
-			<view class="one">
-				<image class="image" :src="oneUrl" mode=""></image>
-			</view>
-			<view class="two">
-				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
-					<view class="list-scroll-view">
-						<view class="list" v-for="(item,index) in list" :key="index">
-							<image class="image" :src="item.url" mode=""></image>
-							<view class="name">
-								{{item.name}}
-							</view>
-							<view class="other">
-								<view class="money">
-									<text>¥</text>
-									<text>{{item.money}}</text>
-								</view>
-								<view class="btn">
-									<button type="default" size="mini">购买</button>
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-	</mobile-frame>
+  <mobile-frame>
+    <view class="main">
+      <view class="one">
+        <image class="image" :src="oneUrl" mode=""></image>
+      </view>
+      <view class="two">
+        <scroll-view
+          scroll-y="true"
+          class="scroll-view"
+          @scrolltolower="toPage"
+        >
+          <view class="list-scroll-view">
+            <view class="list" v-for="(item, index) in list" :key="index">
+              <image class="image" :src="item.url" mode=""></image>
+              <view class="name">
+                {{ item.name }}
+              </view>
+              <view class="other">
+                <view class="money">
+                  <text>¥</text>
+                  <text>{{ item.money }}</text>
+                </view>
+                <view class="btn">
+                  <button type="default" size="mini">购买</button>
+                </view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+  </mobile-frame>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				oneUrl: require('@/static/test.png'),
-				list: [ //
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-				]
-			};
-		},
-		onShow: function() {},
-		methods: {
-			// 分页
-			toPage() {}
-		}
-	}
+export default {
+  data() {
+    return {
+      oneUrl: "",
+      list: [ //
+        {
+          url: "",
+          name: "商品名称",
+          money: 100,
+        },
+      ],
+    };
+  },
+  onShow: function () {},
+  methods: {
+    // 分页
+    toPage() {},
+  },
+};
 </script>
 
 <style lang="scss">
-	.main {
-		display: flex;
-		flex-direction: column;
-		width: 96vw;
-		height: 97.5vh;
-		padding: 2vw;
-		background-color: #0D2576;
+.main {
+  display: flex;
+  flex-direction: column;
+  width: 96vw;
+  height: 97.5vh;
+  padding: 2vw;
+  background-color: #0d2576;
 
-		.one {
-			margin: 0 0 2vw 0;
+  .one {
+    margin: 0 0 2vw 0;
 
-			.image {
-				width: 100%;
-				height: 50vw;
-			}
-		}
+    .image {
+      width: 100%;
+      height: 50vw;
+    }
+  }
 
-		.two {
-			position: relative;
-			flex-grow: 1;
+  .two {
+    position: relative;
+    flex-grow: 1;
 
-			.list {
-				margin: 0 2vw 2vw 0;
-				background-color: var(--fffColor);
-				padding: 2vw;
-				width: 43vw;
-				border-radius: 5px;
+    .list {
+      margin: 0 2vw 2vw 0;
+      background-color: var(--fffColor);
+      padding: 2vw;
+      width: 43vw;
+      border-radius: 5px;
 
-				.image {
-					width: 100%;
-					height: 49vw;
-					margin: 0 0 1vw 0;
-				}
+      .image {
+        width: 100%;
+        height: 49vw;
+        margin: 0 0 1vw 0;
+      }
 
-				.name {
-					font-size: var(--font15Size);
-					margin: 0 0 2vw 0;
-				}
+      .name {
+        font-size: var(--font15Size);
+        margin: 0 0 2vw 0;
+      }
 
-				.other {
-					display: flex;
-					flex-direction: row;
-					justify-content: space-between;
+      .other {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
 
-					.money {
-						color: var(--ff0Color);
+        .money {
+          color: var(--ff0Color);
 
-						text:nth-child(1) {
-							font-size: var(--font12Size);
-						}
-					}
+          text:nth-child(1) {
+            font-size: var(--font12Size);
+          }
+        }
 
-					.btn {
-						button {
-							border-radius: 25px;
-							color: var(--fffColor);
-							background-color: var(--ff0Color);
-							font-size: var(--font12Size);
-						}
-					}
-				}
-			}
+        .btn {
+          button {
+            border-radius: 25px;
+            color: var(--fffColor);
+            background-color: var(--ff0Color);
+            font-size: var(--font12Size);
+          }
+        }
+      }
+    }
 
-			.list:nth-child(2n) {
-				margin: 0 0 2vw 0;
-			}
-		}
-	}
+    .list:nth-child(2n) {
+      margin: 0 0 2vw 0;
+    }
+  }
+}
 
-	.scroll-view {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 
-		.list-scroll-view {
-			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
-		}
-	}
+  .list-scroll-view {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+}
 </style>

pagesHome/place/detail.vue

@@ -33,33 +33,14 @@
 	export default {
 		data() {
 			return {
-				oneUrl: require('@/static/test.png'),
+				oneUrl: '',
 				list: [ //
 					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
+						url: '',
 						name: '商品名称',
 						money: 100,
 					},
+					
 				]
 			};
 		},

pagesHome/place/index.vue

@@ -28,191 +28,191 @@
 	export default {
 		data() {
 			return {
-				oneUrl: require('@/static/test.png'),
+				oneUrl: '',
 				list: [ //
 					{
 						name: '北京特产',
-						url: require('@/static/test.png'),
+						url: '',
 						bgColor: '#FF6573',
 						is_use: true
 					},
 					{
 						name: '河北特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#448E51',
 						is_use: false
 					},
 					{
 						name: '天津特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#8A59B4',
 						is_use: false
 					},
 					{
 						name: '辽宁特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#2A669A',
 						is_use: false
 					},
 					{
 						name: '山西特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#794537',
 						is_use: false
 					},
 					{
 						name: '内蒙特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#397126',
 						is_use: false
 					},
 					{
 						name: '吉林特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#965400',
 						is_use: false
 					},
 					{
 						name: '黑龙江特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#005854',
 						is_use: false
 					},
 					{
 						name: '湖北特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#55C5C5',
 						is_use: false
 					},
 					{
 						name: '湖南特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#659100',
 						is_use: false
 					},
 					{
 						name: '江西特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#CF4779',
 						is_use: false
 					},
 					{
 						name: '河南特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#1F83B7',
 						is_use: false
 					},
 					{
 						name: '安徽特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#302760',
 						is_use: false
 					},
 					{
 						name: '上海特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#8E8A64',
 						is_use: false
 					},
 					{
 						name: '江苏特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#CF6B54',
 						is_use: false
 					},
 					{
 						name: '浙江特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#0B4864',
 						is_use: false
 					},
 					{
 						name: '山东特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#892557',
 						is_use: false
 					},
 					{
 						name: '福建特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#13607A',
 						is_use: false
 					},
 					{
 						name: '广东特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#FF6A52',
 						is_use: false
 					},
 					{
 						name: '海南特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#1D2F79',
 						is_use: false
 					},
 					{
 						name: '广西特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#DD863F',
 						is_use: false
 					},
 					{
 						name: '甘肃特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#118582',
 						is_use: false
 					},
 					{
 						name: '青海特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#9744B6',
 						is_use: false
 					},
 					{
 						name: '宁夏特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#048B50',
 						is_use: false
 					},
 					{
 						name: '新疆特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#5D832C',
 						is_use: false
 					},
 					{
 						name: '重庆特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#32A6BF',
 						is_use: false
 					},
 					{
 						name: '陕西特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#145342',
 						is_use: false
 					},
 					{
 						name: '四川特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#9C3140',
 						is_use: false
 					},
 					{
 						name: '贵州特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#7F8D02',
 						is_use: false
 					},
 					{
 						name: '云南特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#019585',
 						is_use: false
 					},
 					{
 						name: '西藏特产',
-						url: require('@/static/test.png'),
+						url:'',
 						bgColor: '#B4A52E',
 						is_use: false
 					}

pagesHome/poverty/index.vue

@@ -33,30 +33,10 @@
 	export default {
 		data() {
 			return {
-				oneUrl: require('@/static/test.png'),
+				oneUrl:'',
 				list: [ //
 					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '商品名称',
-						money: 100,
-					},
-					{
-						url: require('@/static/test.png'),
+						url: '',
 						name: '商品名称',
 						money: 100,
 					},