Merge branch 'master' into debt

ghsApp/src/admin/clear/customInfo.vue

@@ -153,7 +153,7 @@
 import { getCustomDetail,cancel,confirmClear,refundMoney } from "@/api/clear/index";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
-import { IMGHOST } from '@/config'
+import { APIHOST } from '@/config'
 import { mapGetters } from "vuex";
 export default {
 	name: "customInfo",
@@ -190,7 +190,7 @@ export default {
 		return {
 			title: this.title,
 			desc: "",
-			imageUrl: IMGHOST+'/custom/hit_me_clear.jpg',
+			imageUrl: APIHOST+'/image/custom/hit_me_clear.jpg',
 			path: "admin/clear/showBill?id="+this.detailInfo.id,
 		}
 	},
@@ -204,7 +204,7 @@ export default {
 				type: 5,
 				title: that.title,
 				summary: '暂无',
-				imageUrl: IMGHOST+'/custom/hit_me_clear.jpg',//图片一定要有，不然会分享失败
+				imageUrl: APIHOST+'/image/custom/hit_me_clear.jpg',//图片一定要有，不然会分享失败
 				miniProgram: {
 					id: miniOriginalId,//小程序原始id，发起分享的 App 与小程序属于同一微信开放平台账号
 					path: "admin/clear/showBill?id="+this.detailInfo.id,

ghsApp/src/admin/home/workbench.vue

@@ -37,7 +37,7 @@
     </view>
 	<!-- #endif -->
     <view style="width:100vw;height:250upx;display:flex;align-items:center;justify-content:center;position:relative;margin-bottom:170upx;">
-		<button class="admin-button-com big blue" style="width:260upx;" @click="pageTo({url:'/admin/home/login'})">零售店登录</button>
+		<button class="admin-button-com big blue" style="width:260upx;" @click="pageTo({url:'/admin/home/login'})">门店登录</button>
 		<text style="color:green;position:absolute;top:300upx;font-size:42upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">我要注册</text>
 		<text style="color:green;position:absolute;top:420upx;font-size:42upx;text-decoration: underline;" @click.stop="toPhone()">联系官方</text>
     </view>

ghsApp/src/pagesArrears/clearResult.vue

@@ -34,7 +34,7 @@
 </template>
 <script>
 import { confirmClear,getCustomDetail } from "@/api/clear/index";
-import { IMGHOST } from '@/config'
+import { APIHOST } from '@/config'
 import { mapGetters } from "vuex"
 export default {
     name: "success",
@@ -52,7 +52,7 @@ export default {
 		return {
 			title: this.title,
 			desc: "",
-			imageUrl: IMGHOST+'/custom/hit_me_clear.jpg',
+			imageUrl: APIHOST+'/image/custom/hit_me_clear.jpg',
 			path: "admin/clear/showBill?id="+this.option.id,
 		}
 	},
@@ -86,7 +86,7 @@ export default {
 				type: 5,
 				title: that.title,
 				summary: '暂无',
-				imageUrl: IMGHOST+'/custom/hit_me_clear.jpg',//图片一定要有，不然会分享失败
+				imageUrl: APIHOST+'/image/custom/hit_me_clear.jpg',//图片一定要有，不然会分享失败
 				miniProgram: {
 					id: miniOriginalId,//小程序原始id，发起分享的 App 与小程序属于同一微信开放平台账号
 					path: "admin/clear/showBill?id="+this.option.id,

hdApp/src/pagesPurchase/readMe.vue

@@ -23,36 +23,57 @@
 			</view>
 		</view>
 
-
 		<view class="list" v-if="shopId == 40312">
 			<view>
 				<view class="title">下单须知：</view>
 			</view>
 			<view>
 				<view class="info">
-				市区9：00之后配送；晚上21：00之后不再配送；零担车早班11：00前下单，物流晚班17：00前下单
+				早上市区9:00之后配送;晚上21:00之后不再配送;零担车早班11:00前下单，物流晚班17:00前下单，市区急单请到店自取或者达达自费配送。外地急单可寄的士。
                 </view>
+				<view class="smallTitle">
+				近期不同节气天气变化大，售后有所调整
+				</view>
 				<view class="info">
-				近期灰霉严重，外瓣轻微黄瓣不接受售后，20%为正常损耗，超出20%开始售后，原包装拍图片为准，拆开包装不接受投诉。基地玫瑰存在夹枝，夹枝不售后，特价品种售出一律不售后
+				今天开始，实行新的售后标准。
 				</view>
 				<view class="info">
-					联系电话：
-					<text @tap="toPhone('18159637137')" style="color:#3385FF;">18159637137</text>
+				1、到货后外瓣烂瓣黄瓣，轻微状况不售后。
 				</view>
-				<view>
-					<view class="info">
-					1、请在12小时内投诉，超过时间不予售后
-					</view>
-					<view class="info">
-					2、花材受损（如：擦伤，折断，闷坏），请提供花材受损照片或者视频，能清晰得看到受损情况，受损数量以及花材外包装！一定要有外包装！！
-					</view>
+								<view class="info">
+				2、花型差，花头小，脱水，老花瓣，枝干短枝不售后！
 				</view>
-				<view>
-					<image class="image" :src="`${constant.imgUrl}/cg/hyxhxh1.jpg`" mode="widthFix"></image>
-					<image class="image" :src="`${constant.imgUrl}/cg/hyxhxh2.jpg`" mode="widthFix"></image>
-					<image class="image" :src="`${constant.imgUrl}/cg/hyxhxh3.jpg`" mode="widthFix"></image>
+								<view class="info">
+				3、花瓣擦伤，轻微撞头，不售后！
+				</view>
+								<view class="info">
+				4、多头玫瑰个别花头断头不售后！
+				</view>
+								<view class="info">
+				5、花心烂的，花头压坏花托分离损伤，发霉烂瓣不可使用，花头断头，都不能使用的，单品在原有20%合理损耗的情况下，超出20%以上的部分，双方平摊损耗!如有异议，请谨慎下单，谢谢理解!望大家认真阅读!介意勿拍!
+				</view>
+			</view>
+			<view>
+				<view class="info">
+				退货详情：采购后退货情况，原包装下无拆封可退，已经刮刺，剪短，摘网套玫瑰，影响二次销售情况不可退，如外地退货，运费由买家承担！拒绝到付！
+                </view>
+				<view class="info">
+				特/折价产品说明：小程序标注"特价"，"无售后"，"开花/熟花"以及折价产品为处理品，该商品不售后！
+                </view>
+				<view class="info">
+				注意：玫瑰花没有标注等级，为基地玫瑰。基地玫瑰存在夹支情况，不售后！
+                </view>
+				<view class="info">
+				建议各位客户勤拿少拿!到货第一时间拆箱验货，超24小时反馈的不予以售后!，需要售后花材请拍视频或者图片，能清晰得看到受损情况，受损数量以及花材外包装联系客服处理！
 				</view>
 			</view>
+			<view class="title">
+				客服1号:<text @tap="toPhone('18159637137')" style="color:#3385FF;margin-left:10upx;">18159637137</text>
+			</view>
+			<view class="title">
+				客服2号:<text @tap="toPhone('18859302138')" style="color:#3385FF;margin-left:10upx;">18859302138</text>
+			</view>
+
 		</view>
 		<view class="list" v-if="shopId == 34065">
 			<view>

hdApp/src/pagesPurchase/shopping.vue

@@ -78,7 +78,7 @@ export default {
       supplierList: [],
       tabIndex: 0,
       status: '0',
-      refreshPage:1,
+      refreshPage:0,
 			searchContent:'',			
 			searchTime:'',
 			startTime:'',
@@ -105,8 +105,7 @@ export default {
     if(this.refreshPage == 1){
       this.resetList()
       this.getMyPurchase()
-    }else{
-      this.refreshPage = 1
+      this.refreshPage = 0
     }
   },
   methods: {
@@ -130,15 +129,20 @@ export default {
       this.getMyPurchase()
 		},	
     change(e) {
-			if (this.tabIndex == e.index) {
-				return false;
-			} else {
-        this.resetList()
-				this.tabIndex = e.index;
-        this.status = e.item.key
-        this.getMyPurchase()
-			}
-		},
+      if (this.tabIndex != e.index) {
+        uni.pageScrollTo({
+          scrollTop: 0,
+          duration: 0
+        });
+        this.resetList();
+        this.list.finished = true;
+        this.tabIndex = e.index;
+        this.status = e.item.key;
+        this.getMyPurchase().then(() => {
+          this.list.finished = false;
+        });
+      }
+    },
     init() {
       if(this.option.ghsId){
         this.ghsId = this.option.ghsId?this.option.ghsId:0
@@ -149,11 +153,14 @@ export default {
     getMyPurchase () {
       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 // 待付款
-        this.tabs[2].value = res.data.shop.cgUnSend // 待发货
-        this.tabs[3].value = res.data.shop.cgSending // 待收货
-        this.tabs[4].value = res.data.shop.cgFinish // 已完成
+        if (this.$util.isEmpty(res.data)){
+          return false
+        }
+        this.tabs[0].value = res.data.shop.totalPurchaseOrder
+        this.tabs[1].value = res.data.shop.cgUnPay
+        this.tabs[2].value = res.data.shop.cgUnSend
+        this.tabs[3].value = res.data.shop.cgSending
+        this.tabs[4].value = res.data.shop.cgFinish
       })
     },
     goToDetail (val) {