Merge branch 'test' of http://git.echepei.com/sailun/sailun-tbr-web into test

pages.json

@@ -136,7 +136,12 @@
 					"navigationBarTextStyle": "white"
 				}
 			}
-		]
+		    ,{
+                "path" : "monthly-policy/monthly-policy",
+                "style" : {
+					"navigationBarTitleText": "月度政策"
+				}
+            }]
 	}, {
 		"root": "pages/msg",
 		"pages": [{

pages/home/index.vue

@@ -25,7 +25,8 @@
 				<view class="u-flex u-flex-wrap u-row-center">
 					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/1.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
 					 @click="inStock"></u-image>
-					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/2.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"></u-image>
+					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/2.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
+					@click="inMonthlyPolicy"></u-image>
 					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/3.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
 					 @click="inInlineshop"></u-image>
 					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/4.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
@@ -35,7 +36,6 @@
 			<view class="u-flex u-row-center u-m-t-30">
 				<u-image class="u-skeleton-fillet" width="680rpx" src="../../static/sailun/88reward.png" mode="widthFix"></u-image>
 			</view>
-
 		</view>
 		<!-- 与包裹页面所有内容的元素u-page同级，且在它的下方 -->
 		<!-- <u-tabbar v-model="current" :list="list"></u-tabbar> -->
@@ -127,6 +127,11 @@
 					url: 'pages/home/my-stock/my-stock',
 				})
 			},
+			inMonthlyPolicy: function(){
+				this.$u.route({
+					url: 'pages/home/monthly-policy/monthly-policy',
+				})
+			},
 			inInlineshop() {
 				this.$u.route({
 					url: 'pages/home/inline-shop/inline_shop',

pages/home/monthly-policy/monthly-policy.vue

@@ -0,0 +1,47 @@
+<template>
+	<view>
+		<!-- 月度政策 -->
+		
+	</view>
+</template>
+
+<script>
+	import {
+		request
+	} from '@/common/request/request'
+	require("promise.prototype.finally").shim()
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			this.handleGetData();
+		},
+		methods: {
+			handleGetData: function(){
+				request({
+					url: '/homepage/getArticleOne',
+					method: 'post',
+					data: {
+						"displayType": "1" //门店1
+					}
+				}).then(res => {
+					console.log(res)
+				}).catch(err => {
+					
+				}).finally(() => {
+					setTimeout(() => {
+						uni.hideLoading();
+						this.loading = false;
+					}, 1000)
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/me/agent-stock/agent-stock.vue

@@ -133,6 +133,9 @@
 					}else if(this.current==2){
 						this.showmateriel=true
 					}
+				},
+				handleGetData(){
+					
 				}
 			}
 	}

pages/me/index.vue

@@ -185,7 +185,7 @@
 					<u-cell-item  title="兑换记录">
 						<u-icon slot="icon" size="42" name="balance-list-o" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
-					<u-cell-item  title="经销商库存">
+					<u-cell-item  title="经销商库存" @click="inAgentStock">
 						<u-icon slot="icon" size="42" name="points" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
 					<u-cell-item title="设置" @click="inSetting">
@@ -245,6 +245,11 @@
 					url: 'pages/me/suppliers',
 				})
 			},
+			inAgentStock(){
+				this.$u.route({
+					url: 'pages/me/agent-stock/agent-stock',
+				})
+			},
 			inSetting(){
 				this.$u.route({
 					url: 'pages/me/setting/setting',