Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/billing/affirm.vue

@@ -102,7 +102,6 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">结账方式</view>
-            <!-- <button @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">待付款</button> -->
             <button @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">欠款</button>
             <button @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
           </tui-list-cell>

ghsApp/src/api/product/index.js

@@ -85,7 +85,7 @@ export const generatePriceTable = data => {
 };
 
 //所有花材
-export const allProduct = data => {
+export const allProduct = async data => {
 	return https.get("/product/all", data);
 };
 

hdApp/src/mixins/cgProduct.js

@@ -270,7 +270,13 @@ export default {
 								}
 							})
 							this.setSelectInfoByType({ type: this.pageType, info: currentInfo })
+						}else{
+							//临时解决方案
+							this.resetSelectInfoByType(this.pageType);
 						}
+					}else{
+						//临时解决方案
+						this.resetSelectInfoByType(this.pageType);
 					}			
 				}
 

mallApp/src/utils/auth.js

@@ -2,11 +2,8 @@ import store from '@/store'
 import UTIL from '@/utils/util'
 import { getStaffApi, getUserApi } from '@/api/common'
 import { postWxCode } from '@/api/mini'
-import util from './util'
-/**
- * 获取商城端用户信息
- * @parmas update为true时会重新触发请求，重置vuex的数据
- */
+
+//获取商城端用户信息
 export async function getShopUser(update) {
 	
 }
@@ -36,7 +33,7 @@ export async function getUser(update) {
  */
 export async function getSelfInfo(update) {
 	let userInfo = store.getters.getSelfUser
-	if (!util.isEmpty(userInfo) && !update) {
+	if (!UTIL.isEmpty(userInfo) && !update) {
 		return userInfo
 	}
 	await getStaffApi().then(res => {
@@ -56,7 +53,7 @@ export async function getSelfInfo(update) {
 export async function wxLoginFn(update) {
 	let dataInfo = null
 	let loginInfo = store.state.login.loginInfo
-	if (!util.isEmpty(loginInfo) && !update) {
+	if (!UTIL.isEmpty(loginInfo) && !update) {
 		return loginInfo
 	}
 
@@ -76,7 +73,7 @@ export async function wxLoginFn(update) {
 			uni.setStorageSync('token', subRes.data.token)
 			uni.setStorageSync('miniOpenId', subRes.data.miniOpenId)
 
-			if(subRes.data.user && !$util.isEmpty(subRes.data.user)){
+			if(subRes.data.user && !UTIL.isEmpty(subRes.data.user)){
 				store.commit('setLoginInfo', subRes.data.user)
 			}