Merge branch 'master' into ls

hdApp/src/admin/billing/result.vue

@@ -9,7 +9,6 @@
 <script>
 import appResult from "@/components/app-result";
 import { getDetB} from "@/api/order";
-import { changeHalf } from "@/api/item"
 export default {
 	name: "result",
 	components: {
@@ -24,19 +23,6 @@ export default {
 		}
 	},
 	methods: {
-		subHalf(item){
-			let that = this
-			let orderSn = this.orderInfo.orderSn
-			let remark = "开零售单"+orderSn+"，减少半扎"
-			that.$util.confirmModal({content:'确认减少半扎？'},() => {
-				uni.showLoading()
-				changeHalf({productId:item.itemId,add:0,remark:remark}).then((res) => {
-					uni.hideLoading()
-					let stock = res.data.stock ? res.data.stock : 0
-					uni.showToast({title: '成功，剩 '+stock,duration:2600,icon:'success'})
-				})
-			})
-		},
 		init(){
 			let orderId = this.option.orderId?this.option.orderId:0
 			getDetB({id: orderId}).then(res => {

hdApp/src/components/app-result.vue

@@ -60,11 +60,11 @@ export default {
 		border-radius: 20upx;
 		z-index: 1;
 		.iconchenggong {
-			font-size: 170upx;
+			font-size: 150upx;
 			color: $mainColor1;
 		}
-    .icondaizhifu {
-			font-size: 170upx;
+    	.icondaizhifu {
+			font-size: 150upx;
 			color: #ffa92e;
 		}
 		.result-title {

hdApp/src/components/module/dateSelect.vue

@@ -20,7 +20,7 @@
                 </view>
 
                 <view class="select-item-box">
-                    <view class="title">按月份</view>
+                    <view class="title">选月份</view>
                     <picker mode="date" :value="date" :start="startDate" :end="endDate" fields="month" @change="bindMonthChange" >
                         <view class="item-child_box">
                             <view class="admin-button-com mini-btn default custom" >{{showMonth||'选择月份'}}</view>
@@ -29,7 +29,7 @@
                 </view>
 
                 <view class="select-item-box">
-                    <view class="title">快捷</view>
+                    <view class="title">快捷选项</view>
                     <view class="item-child_box">
                         <button
                             v-for="(item,index) in getDictionariesInfo.dateDefaultOption"
@@ -42,13 +42,14 @@
                 </view>
 
                 <view class="select-item-box">
-                    <view class="title">时间段</view>
+                    <view class="title">选时段</view>
                     <view class="item-child_box" >
                         <view class="admin-button-com mini-btn default custom" @click="showDatePicker(0)">{{startDate || '选择开始日期'}}</view>
                         <view class="admin-button-com mini-btn default custom" @click="showDatePicker(1)">{{endDate || '选择结束日期'}}</view>
                         <view class="admin-button-com mini-btn blue custom" @click="customDateConfirm()">确认</view>
                     </view>
                 </view>
+
             </slot>
         </view>
         <mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="cancelPicker" />
@@ -157,7 +158,7 @@ export default {
                 return false
             }
             this.dropdownShow = false
-            this.defaultDateName = '时间段'
+            this.defaultDateName = this.startDate == this.endDate ?  this.startDate : '选时段' 
             this.$emit('selectDateFn',{searchTime:'custom',startTime:this.startDate,endTime:this.endDate})
         },
         cancelPicker(){
@@ -205,7 +206,7 @@ export default {
         background-color: #FFFFFF;
         left: 0;
         z-index: 29;
-        padding:120upx 30upx 40upx;
+        padding:50upx 30upx 40upx;
         border-radius: 0upx 0upx 20upx 20upx;
         transition: all 0.5s ease-in-out;
         & .select-item-box {
@@ -220,7 +221,7 @@ export default {
                 align-items: center;
                 & .admin-button-com {
                     margin-bottom: 20upx;
-                    padding: 18upx 50upx;
+                    padding: 25upx 50upx;
                     margin-right: 20upx;
                     &.custom {
                         width: 100%;

hdApp/src/pages.json

@@ -335,7 +335,6 @@
 		{
 			"root": "admin/recharge",
 			"pages": [
-
 				{ "path": "renew", "style": { "navigationBarTitleText": "免费续期"}},
 				{ "path": "rechargeSuccess", "style": { "navigationBarTitleText": "免费续期"}},
 				{ "path": "discount", "style": { "navigationBarTitleText": "充值优惠"}},
@@ -384,7 +383,7 @@
 			"root": "admin/member",
 			"pages": [
 				{ "path": "detail", "style": { "navigationBarTitleText": "详情" } },
-				{ "path": "modify", "style": { "navigationBarTitleText": "修改地址" } },
+				{ "path": "modify", "style": { "navigationBarTitleText": "修改地址" } }
 				{"path": "discount","style": {"navigationBarTitleText": "会员优惠"}}
 			]
 		},
@@ -440,8 +439,7 @@
 				{ "path": "order", "style": { "navigationBarTitleText": "买花", "enablePullDownRefresh": true } },
 				{ "path": "pb", "style": { "navigationBarTitleText": "已屏蔽商家", "enablePullDownRefresh": true } },
 				{ "path": "open", "style": { "navigationBarTitleText": "商城功能开关", "enablePullDownRefresh": true } },
-				{ "path": "shopping", "style": { "navigationBarTitleText": "买花记录", "enablePullDownRefresh": true } },
-				{ "path": "contact", "style": { "navigationBarTitleText": "联系官方", "enablePullDownRefresh": true } },				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
+				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "ghsProduct2", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "setPsd", "style": { "navigationBarTitleText": "设置密码", "enablePullDownRefresh": true } },
 				{ "path": "wechatPay", "style": { "navigationBarTitleText": "待支付"} },
@@ -454,6 +452,7 @@
 				{ "path": "info", "style": { "navigationBarTitleText": "订单详情", "enablePullDownRefresh": true } },
 				{ "path": "xj", "style": { "navigationBarTitleText": "请选择颜色"} },
 				{ "path": "refund", "style": { "navigationBarTitleText": "申请退款"} },
+				{ "path": "refundResult", "style": { "navigationBarTitleText": "申请状态"} },
 				{ "path": "refundDetail", "style": { "navigationBarTitleText": "退款详情", "enablePullDownRefresh": true } },
 				{ "path": "level", "style": { "navigationBarTitleText": "会员等级", "enablePullDownRefresh": true } },
 				{ "path": "bookProduct", "style": { "navigationBarTitleText": "预订花材", "enablePullDownRefresh": false } },

hdApp/src/pagesPurchase/gatherPay.vue

@@ -22,7 +22,7 @@
           <div class="call-one-btn">
             <block v-if="orderTime>0">
               <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:50upx;color:red;font-weight:bold;">请确认收到花材质量没有问题</view>
-              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;">欠款单付清后，将无法再售后</view>
+              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;">欠款单付清后，将无法再申请售后</view>
               <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;">确认没问题，点下方按钮付款</view>
 
               <button class="button-com green pay-wx" @click="wxPayFn(1)" style="height:100upx;line-height:50upx;">微信支付</button>

hdApp/src/pagesPurchase/purDetails.vue

@@ -297,7 +297,7 @@
 
       <block v-if="detailInfo.status != 1">
         <block v-if="afterSale == 1">
-          <button class="admin-button-com big" style="margin-right:60upx;" @click="refundOrder()">申请售后</button>
+          <button class="admin-button-com blue big" style="margin-right:60upx;" @click="refundOrder()">申请售后</button>
         </block>
       </block>
 
@@ -311,7 +311,7 @@
         <button class="admin-button-com blue big" v-if="detailInfo.status== 3" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">确认收货</button>
       </block>
 
-      <button class="admin-button-com blue big" v-if="detailInfo.status== 4" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">再次改价</button>
+      <!-- <button class="admin-button-com blue big" v-if="detailInfo.status== 4" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">再次改价</button> -->
 
       <block v-if="detailInfo.status == 1">
         <button class="admin-button-com blue big" @click="toPay">去付款</button>
@@ -401,6 +401,12 @@ export default {
   },
 	onLoad(){
     this.beginInit()
+
+    //返回上一页时不需要刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.refreshPage = 0
+
   },
   methods: {
     affirmTake(){

hdApp/src/pagesPurchase/refund.vue

@@ -230,10 +230,7 @@ export default {
 				uni.showLoading({title: "提交中",mask:true})
 				createRefund(refundParams).then(res => {
 					if(res.code == 1){
-						that.$msg('操作成功')
-						setTimeout(function(){
-							that.$util.pageTo({url: '/pagesPurchase/refundDetail?id='+res.data.id,type:2})
-						},1200)
+						that.$util.pageTo({url: '/pagesPurchase/refundResult?id='+res.data.id,type:2})
 					}
 				})
 			})

hdApp/src/pagesPurchase/refundResult.vue

@@ -0,0 +1,94 @@
+<template>
+  <view class="app-content">
+    <appResult :title="'提交成功'">
+      <button class="admin-button-com blue big" @click="goBack">返回</button>
+      <button class="admin-button-com blue big" @click="gotoDetail">查看详情</button>
+
+      <!-- #ifdef MP-WEIXIN -->
+      <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
+	  <view style="width:690upx;">
+      	<ad-custom unit-id="adunit-b3f48f1b6c1a39ff"></ad-custom>
+	  </view>
+      <!-- #endif -->
+
+    </appResult>
+  </view>
+</template>
+<script>
+import appResult from "@/components/app-result";
+export default {
+	name: "refundResult",
+	components: {
+		appResult
+	},
+	data(){
+		return {
+            id:0
+		}
+	},
+	methods: {
+		init(){
+		},
+		gotoDetail() {
+            this.id = this.option.id?this.option.id:0
+            this.$util.pageTo({url: '/pagesPurchase/refundDetail?id='+this.id,type:2})
+		},
+		goBack() {
+			uni.navigateBack({ delta: 1 })
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.admin-button-com {
+	margin-bottom: 40upx;
+	width: 100%;
+}
+.zuhe-box{
+	width: 100%;
+  padding:  0 20upx;
+	margin-bottom: 20upx;
+  background-color: #fff;
+	.zuhe-remark{
+		color: #333;
+		font-size: 32upx;
+    font-weight: 700;
+    line-height: 88upx;
+	}
+	.zuhe-center{
+		font-size: 28upx;
+    height: 90upx;
+    box-sizing: border-box;
+    .zuhe-title{
+      color: #666;
+    }
+    &>input{
+      border: 1px solid #eee!important;
+      border-radius: 5upx!important;
+    }
+		.zuhe-val{
+			position: relative;
+			width: 70%;
+			height: 60upx;
+			padding: 10upx;
+      color: #333;
+			border: 1px solid #868686;
+      border: none;
+			&.active:before {
+				content: ' ';
+				height: 22upx;
+				width: 22upx;
+				border-width: 2upx 2upx 0 0;
+				border-color: #868686;
+				border-style: solid;
+				-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				position: absolute;
+				top: 50%;
+				margin-top: -12upx;
+				right: 30upx;
+			}
+		}
+	}
+}
+</style>

hdApp/src/pagesPurchase/shopping.vue

@@ -1,6 +1,16 @@
 <template>
   <view class="order-page">
     <app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="20%"/>
+
+			<view style="margin-left:60upx;margin-top:110upx;padding-bottom:30upx;position: relative;">
+				<DateSelect @selectDateFn="selectDateFn" defaultShowName='时间' />
+        
+        <button class="admin-button-com mini-btn blue" style="position: absolute;right:300upx;top:-8upx;" @click="debtChangeFn()">选供货商</button>
+
+        <button class="admin-button-com mini-btn blue" style="position: absolute;right:80upx;top:-8upx;" @click="debtChangeFn()">重置搜索</button>
+
+			</view>
+
     <block v-if="!$util.isEmpty(list.data)">
     <view class="pay_list">
         <OrderItem v-for="(item, index) in list.data" :key="index" :info="item" @click="goToDetail"></OrderItem>
@@ -11,9 +21,11 @@
       <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)"/>
     </view>
     </block>
+
     <view class="app-footer open_btn">
 			<view @click="addEvent" class="admin-button-com big blue">新增采购</view>
 		</view>
+
   </view>
 </template>
 <script>
@@ -22,11 +34,13 @@ import OrderItem from "./orderItem";
 import { list } from "@/mixins";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { ghsList, purchaseList } from "@/api/purchase/index";
+import DateSelect from "@/components/module/dateSelect";
 export default {
   components: {
     AppWrapperEmpty,
     OrderItem,
-    AppTabs
+    AppTabs,
+    DateSelect
   },
   mixins: [list],
   data () {
@@ -63,7 +77,13 @@ export default {
       },
       supplierList: [],
       tabIndex: 0,
-      status: '0'
+      status: '0',
+      refreshPage:1,
+			searchContent:'',			
+			searchTime:'',
+			startTime:'',
+      ghsId:0,
+      ghsName:''
     }
   },
   onReachBottom () {
@@ -75,12 +95,28 @@ export default {
       uni.stopPullDownRefresh()
     }
   },
-  onPullDownRefresh() {
+  onPullDownRefresh () {
+    this.resetList();
     this.getpurchaseList().then(res => {
       uni.stopPullDownRefresh()
     })
   },
+  onShow(){
+    if(this.refreshPage == 1){
+      this.resetList()
+      this.getpurchaseList()
+    }else{
+      this.refreshPage = 1
+    }
+  },
   methods: {
+		selectDateFn(val) {
+			this.searchTime = val.searchTime
+			this.startTime = val.startTime
+			this.endTime = val.endTime
+      this.resetList()
+      this.getpurchaseList()
+		},	
     change(e) {
 			if (this.tabIndex == e.index) {
 				return false;
@@ -95,7 +131,7 @@ export default {
       this.getpurchaseList()
     },
     getpurchaseList () {
-      return purchaseList({ status: this.status,page: this.list.page }).then(res => {
+      return purchaseList({ status: this.status,page: this.list.page,searchTime: this.searchTime,startTime: this.startTime,endTime: this.endTime,ghsId:this.ghsId}).then(res => {
         this.completes(res)
         this.tabs[0].value = res.data.shop.totalPurchaseOrder // 全部
         this.tabs[1].value = res.data.shop.cgUnPay // 待付款
@@ -197,7 +233,7 @@ export default {
     }
   }
   .pay_list {
-    padding-top: 100upx;
+    padding-top:20upx;
     padding-bottom: 100upx;
     background-color: #f0f2f6;
   }

mallApp/src/pages/callback/index.vue

@@ -49,7 +49,17 @@
           <img :src="`${constant.imgUrl}/retail/images/extension.png`" alt mode="widthFix" />
         </div>
       </div>
+
+      <!-- #ifdef MP-WEIXIN -->
+      <view style="width:100%;margin-top:25upx;text-align:center;">
+        <view style="background-color: white;margin:0 auto;width:676upx;">
+          <ad-custom unit-id="adunit-510957a20b72a06b" style=""></ad-custom>
+        </view>
+      </view>
+      <!-- #endif -->
+
     </div>
+    </alert-module>
   </div>
 </template>
 <script>

mallApp/src/pages/home/recent.vue

@@ -1,113 +1,90 @@
 <template>
   <view class="latest-content_box">
-      <view class="shop-list_box" v-if="showGlInfo == 0">
+    <view class="shop-list_box" v-if="showGlInfo == 0">
 
-          <block v-if="globalLoginStyle  == 0">
-            <view style="width:100vw;height:500upx;display:flex;align-items:center;justify-content:center;">
-              <button class="admin-button-com big blue" style="border:none;" @click="pageTo({url:'/pages/login/index'})">点我登录</button>
-            </view>
-          </block>
-          <block v-else>
-
-              <view class="ghs_list_page flex-col" v-if="!$util.isEmpty(list)">
-
-                <view style="background-color:white;margin-bottom:20upx;display: flex;justify-content: space-around;">
-                  <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">修改密码</button>
-                  <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">提建议</button>
-                  <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">我的地址</button>
-                  <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">采购统计</button>
-                  <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="logout()">退出</button>
-                </view>
-
-                <view class="ghs_list_area flex-col justify-end">
+  <block v-if="loginStyle  == 0">
+    <view style="width:100vw;height:500upx;display:flex;align-items:center;justify-content:center;">
+      <button class="admin-button-com big blue" style="border:none;" @click="pageTo({url:'/pages/login/index'})">点我登录</button>
+    </view>
+  </block>
+  <block v-else>
 
-                    <view class="ghs_box flex-col justify-end" v-for="item in list" :key="item.id">
-                      <view class="image-text_7 flex-row justify-between" @click.stop="bug(item)">
-                        <view class="section_1 flex-col">
-                          <image class="logo" :src="item.smallAvatar" />
-                        </view>
-                        <view class="text-group_7 flex-col justify-between">
-                          <text class="text_8">{{item.name}}</text>
-                          <text class="text_9">{{item.address}}{{item.floor}}</text>
-                        </view>
-                      </view>
-                      <view class="box_4 flex-col"></view>
-                      <view class="box_9">
-                        <view class="tag_2" @click="showTip()"> <text>待结订单</text> </view>
-                        <view class="tag_2" @click="showTip()"> <text>结账记录</text> </view>
-                        <view class="tag_2" @click="getBuyList()"> <text>买花记录</text> </view>
-                        <view class="tag_2" @click="getMore(item)"> <text>更多</text> </view>
-                      </view>
 
-                      <block v-if="Number(item.balance)>0">
-                        <view class="box_6 flex-row">
-                          <view class="show_clear_area flex-row justify-between">
-                            <text class="waite_clear_order" style="color:#3385ff;">
-                                <text>可用余额 ¥{{ item.balance ? parseFloat(item.balance) : 0 }}</text>
-                            </text>
-                          </view>
-                        </view>
-                      </block>
+      <view class="ghs_list_page flex-col" v-if="!$util.isEmpty(list)">
 
-                      <view class="button_4 flex-col" @click.stop="bug(item)"><text class="text_13">买花</text></view>
-                      <view class="button_6 flex-col" @click.stop="recharge(item)" v-if="item.rechargeWeal != 0"><text class="text_13">充值</text></view>
+        <view style="background-color:white;margin-bottom:20upx;">
+          <button class="admin-button-com mini-btn blue" style="margin-left:4upx;padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">修改密码</button>
+          <button class="admin-button-com mini-btn blue" style="margin-left:4upx;padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">改进建议</button>
+          <button class="admin-button-com mini-btn blue" style="margin-left:4upx;padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">我的地址</button>
+          <button class="admin-button-com mini-btn blue" style="margin-left:4upx;padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">采购统计</button>
+          <button class="admin-button-com mini-btn blue" style="margin-left:4upx;padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="logout()">退出登录</button>
+        </view>
 
-                    </view>
+        <view class="ghs_list_area flex-col justify-end">
 
+            <view class="ghs_box flex-col justify-end" v-for="item in list" :key="item.id">
+              <view class="image-text_7 flex-row justify-between" @click.stop="bug(item)">
+                <view class="section_1 flex-col">
+                  <image class="logo" :src="item.smallAvatar" />
+                </view>
+                <view class="text-group_7 flex-col justify-between">
+                  <text class="text_8">{{item.name}}</text>
+                  <text class="text_9">{{item.address}}{{item.floor}}</text>
                 </view>
               </view>
-              <view v-else>
-                <text style="margin-top:200upx;margin-left:80upx;font-size:30upx;font-weight:bold;">暂无花店</text>
+              <view class="box_4 flex-col"></view>
+              <view class="box_9">
+                <view class="tag_2" @click="showTip()"> <text>待结订单</text> </view>
+                <view class="tag_2" @click="showTip()"> <text>结账记录</text> </view>
+                <view class="tag_2" @click="getBuyList()"> <text>买花记录</text> </view>
               </view>
+              <view class="button_4 flex-col" @click.stop="bug(item)"><text class="text_13">买花</text></view>
+            </view>
 
-          </block>
-
+        </view>
       </view>
-      <view class="app-main app-content" v-else>
-      <app-swiper :list="ad" />
-      <view class="shop-wrap">
-        <view class="shop-tit">花卉宝</view>
-        <view>厦门市中花汇信息有限公司，成立于2015年，目前旗下有销花宝、花卉宝和花掌柜三个品牌，公司致力于帮助花店更轻松高效管理花店。</view>
+      <view v-else>
+        <text style="margin-top:200upx;margin-left:80upx;font-size:30upx;font-weight:bold;">暂无花店</text>
       </view>
-      <view class="list-content">
-        <tui-list-view class="tui-list-view">
-          <tui-list-cell :lineLeft="false" :lineRight="false" class="tui-list" >
-            <view class="list-wrap">
-              <view class="list-label">营业时间</view>
-              <view class="list-val">{{ shop.openTime || '08:00-22:00' }}</view>
-            </view>
-          </tui-list-cell>
-          <tui-list-cell @click="phoneCall" :lineLeft="false" :lineRight="false" class="tui-list" >
-            <view class="list-wrap">
-              <view class="list-label">联系电话</view>
-              <view class="list-val">{{ shop.telephone || '15280215347' }}</view>
-            </view>
-            <view class="list-icon">
-              <i class="iconfont iconditu" style="font-size:36upx;" ></i>
-            </view>
-          </tui-list-cell>
-          <tui-list-cell @click="goNavBtn" :lineLeft="false" :lineRight="false" class="tui-list" >
-            <view class="list-wrap">
-              <view class="list-label">公司地址</view>
-              <view class="list-val">厦门市软件园二期夜光汇2号楼521室</view>
-            </view>
-            <view class="list-icon">
-              <i class="iconfont icondianhua" style="font-size:36upx;" ></i>
-            </view>
-          </tui-list-cell>
-        </tui-list-view>
-      </view>
-    </view>
 
-    <uni-popup ref="toShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-      <view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-        <view style="width:94vw;margin-top:8upx;"><button @click="rechargeChange()">充值记录</button></view>
-        <view style="width:94vw;margin-top:8upx;"><button @click="balanceChange()">余额变动记录</button></view>
-        <view style="width:94vw;margin-top:8upx;"><button @click="bpSj()">等级变动记录</button></view>
-        <view style="width:94vw;margin-top:50upx;"><button @click="closeToShow()">取消</button></view>
-      </view>
-    </uni-popup>
+  </block>
 
+    </view>
+    <view class="app-main app-content" v-else>
+    <app-swiper :list="ad" />
+    <view class="shop-wrap">
+      <view class="shop-tit">花卉宝</view>
+      <view>厦门市中花汇信息有限公司，成立于2015年，目前旗下有销花宝、花卉宝和花掌柜三个品牌，公司致力于帮助花店更轻松高效管理花店。</view>
+    </view>
+    <view class="list-content">
+      <tui-list-view class="tui-list-view">
+        <tui-list-cell :lineLeft="false" :lineRight="false" class="tui-list" >
+          <view class="list-wrap">
+            <view class="list-label">营业时间</view>
+            <view class="list-val">{{ shop.openTime || '08:00-22:00' }}</view>
+          </view>
+        </tui-list-cell>
+        <tui-list-cell @click="phoneCall" :lineLeft="false" :lineRight="false" class="tui-list" >
+          <view class="list-wrap">
+            <view class="list-label">联系电话</view>
+            <view class="list-val">{{ shop.telephone || '15280215347' }}</view>
+          </view>
+          <view class="list-icon">
+            <i class="iconfont iconditu" style="font-size:36upx;" ></i>
+          </view>
+        </tui-list-cell>
+        <tui-list-cell @click="goNavBtn" :lineLeft="false" :lineRight="false" class="tui-list" >
+          <view class="list-wrap">
+            <view class="list-label">公司地址</view>
+            <view class="list-val">厦门市软件园二期夜光汇2号楼521室</view>
+          </view>
+          <view class="list-icon">
+            <i class="iconfont icondianhua" style="font-size:36upx;" ></i>
+          </view>
+        </tui-list-cell>
+      </tui-list-view>
+    </view>
+  </view>
   </view>
 </template>
 <script>
@@ -129,7 +106,8 @@ export default {
       list: [],
       showGlInfo: 0,
       ad:[{"img":`${this.$constant.imgUrl}/logo2.jpg?v=5`}],
-      currentHd:{}
+      //0没有登录 1有登录
+      loginStyle :0
     };
   },
   computed: {
@@ -138,30 +116,23 @@ export default {
 	watch: {
 		loginInfo(newVal) {
       if(!this.$util.isEmpty(newVal)){
-        this.globalLoginStyle = 1
+        this.loginStyle = 1
       }else{
-        this.globalLoginStyle = 0
+        this.loginStyle = 0
       }
 		}
 	},
   onShow () {
       if(!this.$util.isEmpty(this.loginInfo)){
-        this.globalLoginStyle = 1
+        this.loginStyle = 1
       }else{
-        this.globalLoginStyle = 0
+        this.loginStyle = 0
       }
       this.getShopList()
   },
   onLoad () {
   },
   methods: {
-		closeToShow(){
-			this.$refs.toShowMore.close()
-		},
-    getMore(info){
-			this.currentHd = info
-			this.$refs.toShowMore.open('top')
-    },
     logout(){
       let that = this
       that.$util.confirmModal({content:'确认退出？'},() => {
@@ -188,10 +159,7 @@ export default {
       this.$msg('开发中')
     },
     bug(item){
-      this.pageTo({ url:'/pages/item/item?account='+item.shopId+'&hdId='+item.id})
-    },
-    recharge(item){
-      this.pageTo({ url:'/pages/member/recharge?account='+item.shopId+'&id='+item.id+'&salt='+item.salt})
+      this.pageTo({ url:'/pages/item/item?account='+item.shopId})
     },
     init () {
         this.getShopList()
@@ -367,19 +335,19 @@ export default {
         margin-top: 40upx;
       }
       .box_9 {
-        height: 70upx;
-        padding: 23upx 0 22upx 0upx;
-        display: flex;
-        justify-content: space-around;
+        height: 65upx;
+        padding: 23upx 0 22upx 30upx;
         .tag_2 {
           background-color: rgba(255, 255, 255, 1);
           border-radius: 8px;
-          height: 65upx;
-          line-height:65upx;
+          height: 60upx;
+          line-height:60upx;
           border: 2px solid rgba(221, 221, 221, 1);
           color: rgba(51, 51, 51, 1);
           font-size: 30upx;
+          margin:0 50upx 0 0;
           text-align:center;
+          float:left;
           padding-left:20upx;
           padding-right:20upx;
         }
@@ -470,15 +438,15 @@ export default {
         }
       }
       .button_4 {
-        height: 95upx;
-        line-height:95upx;
+        height: 80upx;
+        line-height:80upx;
         text-align:center;
         background-color:#FF2842;
         background-size: 137upx 137upx;
         width: 130upx;
         position: absolute;
         left: 570upx;
-        top:100upx;
+        top:90upx;
         border-radius:20upx;
         .text_13 {
           color: rgba(255, 255, 255, 1);
@@ -503,23 +471,6 @@ export default {
           font-weight:bold;
         }
       }
-      .button_6 {
-        height: 95upx;
-        line-height:95upx;
-        text-align:center;
-        background-color:#FF2842;
-        background-size: 137upx 137upx;
-        width: 130upx;
-        position: absolute;
-        left: 380upx;
-        top:100upx;
-        border-radius:20upx;
-        .text_13 {
-          color: rgba(255, 255, 255, 1);
-          font-size: 30upx;
-          font-weight:bold;
-        }
-      }
     }
   }
 }