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

ghs/package-lock.json

@@ -1886,6 +1886,16 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1616431100222&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -1912,6 +1922,34 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
+          "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
         "debug": {
           "version": "4.3.1",
           "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1607566533140&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz",
@@ -1921,6 +1959,25 @@
             "ms": "2.1.2"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "lru-cache": {
           "version": "5.1.1",
           "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz?cache=0&sync_timestamp=1599054167787&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-5.1.1.tgz",
@@ -1961,6 +2018,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1611394878204&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz",
@@ -1978,6 +2045,18 @@
             "webpack-sources": "^1.4.3"
           }
         },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.2.0",
+          "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.2.0.tgz?cache=0&sync_timestamp=1616796537201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.2.0.tgz",
+          "integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
+        },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.1.tgz",
@@ -13141,87 +13220,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.2.0",
-      "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.2.0.tgz?cache=0&sync_timestamp=1616796537201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.2.0.tgz",
-      "integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
-          "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1611394878204&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.5.1",
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.5.1.tgz?cache=0&sync_timestamp=1617697726574&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.5.1.tgz",

ghsApp/src/App.vue

@@ -15,7 +15,7 @@ export default {
 		// #ifdef H5
 		// H5开发环境无法微信授权，使用固定的用户 shish 2020.4.30
 		if (process.env.NODE_ENV == "development") {
-			uni.setStorageSync("token","eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNTIifQ.eyJpc3MiOiJodHRwczpcL1wvYXBpLnNob3AuaHpnaGQuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5zaG9wLmh6Z2hkLmNvbSIsImp0aSI6IjBfNTIiLCJpYXQiOjE2MTYxNTc2NjQsIm5iZiI6MTYxNjE1NzY2NCwiZXhwIjoxNjI0Nzk3NjY0LCJ1bmlxdWVJZCI6IjUyIiwic291cmNlSWQiOjB9.VzSekbSwSczMWsfdPVdrm3gZ-v9o3p01NbMVNT4nGZ4")
+			uni.setStorageSync("token","eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMSJ9.eyJpc3MiOiJodHRwOlwvXC9hcGkuc2hvcC5oemdoZC5jb20iLCJhdWQiOiJodHRwOlwvXC9hcGkuc2hvcC5oemdoZC5jb20iLCJqdGkiOiIwXzEiLCJpYXQiOjE2MTg0MDg4NTcsIm5iZiI6MTYxODQwODg1NywiZXhwIjoxNjI3MDQ4ODU3LCJ1bmlxdWVJZCI6IjEiLCJzb3VyY2VJZCI6MH0.iDSEqewx8D1vdiyhQDkfBJBDWljF4zK19M0uqhGmLe4")
 			uni.setStorageSync("account", "0")
 			getDictionaries({ token: uni.getStorageSync('token') }).then(res => {
 				if (util.isEmpty(res)) {

ghsApp/src/admin/home/workbench.vue

@@ -265,15 +265,15 @@ export default {
 				},
 				{
 					name: "总收入",
-					value: 0
+					value: 0.00
 				},
 				{
 					name: "总支出",
-					value: 0
+					value: 0.00
 				},
 				{
 					name: "总采购",
-					value: 0
+					value: 0.00
 				}
 			],
 			cgSrc: `${this.$constant.imgUrl}/ghs/home/cg.png`,
@@ -331,11 +331,11 @@ export default {
 					this.orderData[2].value = todayData.order;
 					// 总览数据
 					this.totalData[0].value = asset.totalUser;
-					this.totalData[1].value = asset.totalMember;
-					this.totalData[2].value = asset.totalVisit;
+					this.totalData[1].value = asset.totalView;
+					this.totalData[2].value = asset.finishOrder;
 					this.totalData[3].value = asset.totalIncome;
 					this.totalData[4].value = asset.totalExpend;
-					this.totalData[5].value = asset.remainSmsNum;
+					this.totalData[5].value = asset.totalPurchase;
 				}
 			});
 		},

hdApp/src/admin/billing/result.vue

@@ -5,20 +5,33 @@
 }
 .zuhe-box{
 	width: 100%;
-	margin-top: 30rpx;
+	// margin-top: -30px;
+  background-color: #fff;
 	.zuhe-remark{
-		color: #868686;
-		font-size: 24rpx;
+		color: #333;
+		font-size: 32rpx;
+    font-weight: 700;
+    line-height: 88upx;
+    padding-left: 30upx;
+    border-bottom: 1px solid #eee;
 	}
 	.zuhe-center{
 		margin-top: 20rpx;
 		font-size: 28rpx;
+    margin: 0 30upx;
+    height: 90upx;
+    box-sizing: border-box;
+    .zuhe-title{
+      color: #666;
+    }
 		.zuhe-val{
 			position: relative;
 			width: 70%;
 			height: 60rpx;
 			padding: 10rpx;
+      color: #333;
 			border: 1px solid #868686;
+      border: none;
 			&.active:before {
 				content: ' ';
 				height: 22px;
@@ -35,40 +48,45 @@
 			}
 		}
 	}
+  .border{
+    border-bottom: 1px solid #eee;
+  }
 }
 </style>
 <template>
-	<appResult>
-<!--		<button class="admin-button-com blue big" @click="gotoOrderDetails">发货详情</button>-->
-		<button class="admin-button-com blue big" @click="gotoOrderSend">发货</button>
-<!--		<button class="admin-button-com big" @click="gotoOrderPrint">打印单据</button>-->
-<!--		<button class="admin-button-com big" @click="gotoOrderDetails">订单详情</button>-->
-<!--		<button class="admin-button-com big" @click="gotoOrderList">订单列表</button>-->
-		<button class="admin-button-com big" @click="gotoPlace">继续开单</button>
-
-		<view class="zuhe-box" v-if="option.type=='zuhe'">
-			<view class="" v-if="!isGroup">
-				<view class="zuhe-remark">保存此商品组合，以便下次取用：</view>
-				<view class="flex-space zuhe-center">
-					<view class="zuhe-title ">名称</view>
-					<input class="zuhe-val" type="text" placeholder="如：开业花篮（200）" v-model="name" placeholder-class="tui-placeholder">
-				</view>
-				<view class="flex-space zuhe-center">
-					<view class="zuhe-title ">所属分类</view>
-					<picker class="zuhe-val active" @change="selectType" :value="index" :range="type" range-key="categoryName">
-						<view class="uni-input">{{type[index].categoryName}}</view>
-					</picker>
-				</view>
-				<view class="flex-center" style="margin-top: 30rpx">
-					<button class="admin-button-com blue big" style="width: 40%;" @click="SubSaveItemGroup">保存</button>
-				</view>
-			</view>
-			<view style="text-align: center;color: #868686" v-else>
-					<view class="iconfont iconchenggong" style="color:#049E2C;margin-bottom:15rpx;font-size:80rpx;" ></view>
-				<view>保存成功，请在【开单 - 成品】查看</view>
-			</view>
-		</view>
-	</appResult>
+  <view class="app-content">
+    <appResult>
+  <!--		<button class="admin-button-com blue big" @click="gotoOrderDetails">发货详情</button>-->
+      <button class="admin-button-com blue big" @click="gotoOrderSend">发货</button>
+  <!--		<button class="admin-button-com big" @click="gotoOrderPrint">打印单据</button>-->
+  <!--		<button class="admin-button-com big" @click="gotoOrderDetails">订单详情</button>-->
+  <!--		<button class="admin-button-com big" @click="gotoOrderList">订单列表</button>-->
+      <button class="admin-button-com big" @click="gotoPlace">继续开单</button>
+      <view style="text-align: center;color: #868686" v-if="option.type === 'zuhe' && isGroup">
+        <view class="iconfont iconchenggong" style="color:#049E2C;margin-bottom:15rpx;font-size:80rpx;" ></view>
+        <view>保存成功，请在【开单 - 成品】查看</view>
+      </view>
+    </appResult>
+    <view class="zuhe-box" v-if="option.type === 'zuhe' && !isGroup">
+        <view class="">
+          <view class="zuhe-remark">保存此商品组合，以便下次取用：</view>
+          <view class="flex-space zuhe-center border">
+            <view class="zuhe-title">名称</view>
+            <input class="zuhe-val" type="text" placeholder="如：开业花篮 200元" v-model="name" placeholder-class="tui-placeholder">
+          </view>
+          <view class="flex-space zuhe-center">
+            <view class="zuhe-title">所属分类</view>
+            <picker class="zuhe-val active" @change="selectType" :value="index" :range="type" range-key="categoryName">
+              <view class="uni-input">{{type[index].categoryName}}</view>
+            </picker>
+          </view>
+          
+        </view>
+      </view>
+      <view class="flex-center" style="margin-top: 30rpx" v-if="option.type === 'zuhe' && !isGroup">
+            <button class="admin-button-com blue big" style="width: calc(100vw - 60upx);" @click="SubSaveItemGroup">保存</button>
+          </view>
+  </view>
 </template>
 
 <script>

hdApp/src/components/app-result.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="app-content">
+	<view>
 		<view class="billing_box_bg">
 			<view class="top-view"> </view>
 			<view class="result-view">
@@ -31,12 +31,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.app-content{
+  min-height: 40wh;
+}
 .billing_box_bg {
 	position: relative;
-	padding: 60px 30px;
+	padding: 60px 30px 30px;
 	display: flex;
 	flex-direction: column;
-    background-color: #f5f5f5;
+  background-color: #f5f5f5;
 	.top-view {
 		position: absolute;
 		top: 0;

mallApp/src/pages/home/index.vue

@@ -55,14 +55,20 @@ export default {
       ad: [],
       category: [],
       columnStyle: null,
-      currentTabIndex: 0
+      currentTabIndex: 0,
+      account: ''
     };
   },
   computed: {
     ...mapGetters({ orderShop: "getOrderShop" })
   },
-  onLoad (option) { },
+  onLoad (option) {
+    console.log('onload===>', option)
+  },
   mounted () { },
+  onShow () {
+    uni.hideTabBar()
+  },
   methods: {
     init () {
       getOrderShop().then(res => {

mallApp/src/pages/home/recent.vue

@@ -5,8 +5,11 @@
         <view
           :key="item.shopId"
           @click="pageTo({
-              url: '/pages/home/index?account='+item.shopId,
-              type:4
+              url: '/pages/home/index',
+              type:4,
+              query: {
+                account: '15680'
+              }
             })"
           v-for="item in list"
         >

mallApp/src/utils/util.js

@@ -208,7 +208,10 @@ export const pageTo = (item) => {
 			})
 		} else if (item.type == 4) {
 			console.log('switchTab', item.query)
-			uni.setStorageSync('switchTabQuery', item.query)
+      uni.setStorageSync('switchTabQuery', item.query)
+      if (item.query.account) {
+        uni.setStorageSync('account', item.query.account)
+      }
 			uni.switchTab({
 				url: item.url
 			})

pt/src/components/module/sj-list-layer.vue

@@ -5,6 +5,7 @@
     :close-on-click-modal="false"
     :append-to-body="true"
     width="800px"
+    @close="$emit('update:show', false)"
   >
     <div class="recharge-modal-content">
       <el-radio-group

pt/vue.config.js

@@ -3,7 +3,8 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = process.env.NODE_ENV === 'local' ? 'https://api.pt.huaml.com' : 'https://api.pt.huaml.com';
+const proxyTarget =
+	process.env.NODE_ENV == 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);