Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

mixins/index.js

@@ -353,11 +353,10 @@ module.exports = {
    * @author : 周兴
    * @date : 2024/4/22
    */
-  printedBill() {
+  printedBill(row) {
     // 查询票据
-    console.log('rrr1', app.globalData['routeUrl'][this.data.routeObjName]);
     let docName = app.globalData['routeUrl'][this.data.routeObjName].docName
-    if (!docName) {
+    if (!docName  || !row || !row.id) {
       return;
     }
     let service = app.globalData['printLayoutService']
@@ -369,8 +368,8 @@ module.exports = {
         if (tableList && tableList.length > 0) {
           // 如果只有一个票据，直接调取打印
           if (tableList.length == 1) {
-            console.log('ddd', this.data.id);
-            this.print(docName, tableList[0].layoutId, this.data.id)
+            console.log('ddd', row,this.data.primaryKey,this.data.id);
+            this.print(docName, tableList[0].layoutId, row.id)
           }
         }
       }

package-sales/pages/order-billing/order-billing.js

@@ -103,8 +103,8 @@ Page({
       bill: 0,
       quantity: 0
     }],
-    outStatus: []
-
+    outStatus: [],
+    primaryKey:'orderId'
   },
   /**
   * @desc :   处理接口返回数据

pages/mine/mine.js

@@ -27,6 +27,7 @@ Page({
     staffName: 'null',
     orgName: null,
     waitMenuFlag:true, // 是否显示待办工作区
+    statusHeight: 0, // 状态栏高度
     // 路由
     routeObjName: 'setting',
     wechatPayService: app.globalData['wechatPayService'],
@@ -538,6 +539,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    let res = wx.getSystemInfoSync();
+    let statusHeight = res.statusBarHeight
+    this.setData({
+      statusHeight: statusHeight * 2 + 20
+    })
     let waitMenu = this.data.waitMenu;
     let waitMenuFlag = false;
     waitMenu.forEach(it => {

pages/mine/mine.wxml

@@ -2,10 +2,13 @@
 <wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs>
 <!-- 加载图层 -->
 <loading wx:if="{{loading}}"></loading>
-<view class="head">
-  <view class="company">
-    <view style="display: flex;align-items: center;"  catchtap="changeCp">
-      <view style="margin-right: 10rpx;">
+<!-- 顶部 -->
+<view>
+  <image src="{{imageUrl + 'home-back.png'}}" class="head-image"></image>
+  <!-- 公司 -->
+  <view class="company" style="top:{{statusHeight + 'rpx'}}">
+    <view style="display: flex;align-items: center;" catchtap="changeCp">
+      <view class="company-change-class">
         {{companyName?companyName:''}}
       </view>
       <image src="/static/image/triangle.png" style="width: 28rpx;height:28rpx;"></image>
@@ -38,14 +41,14 @@
   </view>
 </view>
 
-<!-- 待办 -->
-<view style="background-color:#f8f9fd;border-radius:40rpx 40rpx 0rpx 0rpx;margin-top: -57rpx;" >
-  <view style="height: 35rpx;"></view>
+<!--内容-->
+<view class="content" style="padding-top: {{ (statusHeight + 210) + 'rpx'}};">
+  <!--待办工作-->
   <view class="todo-view" wx:if="{{waitMenuFlag}}">
     <view class="todo-view-title">待办工作</view>
     <view class="todo-view-app">
       <view class="todo-view-app-item" wx:for="{{waitMenu}}" wx:for-item="item" data-item="{{item}}" catchtap="toApp" wx:if="{{item.show}}">
-        <view class="todo-view-app-item-icon" >
+        <view class="todo-view-app-item-icon">
           <!-- 待办角标提醒 -->
           <view class="todo-view-app-item-icon-tip" wx:if="{{item.count}}">{{item.count?item.count:0}}</view>
           <image src="{{imageUrl + item.icon}}" style="width:100%;height:100%;" />
@@ -55,6 +58,7 @@
     </view>
   </view>
 
+  <!--门店助手-->
   <van-tabs animated active="{{ active }}" swipeable nav-class="mine-tabs-custom-class" bind:change="onChange">
     <van-tab title="标签 1" name="store">
       <!-- 助手 -->
@@ -209,10 +213,8 @@
         </view>
 
       </view>
-
     </van-tab>
 
-
     <van-tab title="标签 2" name="staff" wx:if="{{false}}">
       <!-- 助手2 -->
       <view class="helper-out-view">
@@ -369,7 +371,6 @@
     </van-tab>
   </van-tabs>
 
-
   <view class="swiper-controller" wx:if="{{showStoreFlag}}">
     <view data-type="store" catchtap="swiperChange">
       <van-icon name="play" style="transform: rotate(180deg);" size="20rpx" color="#1B365D" />
@@ -379,38 +380,45 @@
     </view>
   </view>
 
+  <view style="margin-top: 30rpx;">
+
+    <view class="todo-view" style="margin-bottom: 4rpx;">
+      <view class="todo-view-title" catch:tap="toSetting">{{$t['settingCommany']}}</view>
+    </view>
+    <view class="todo-view" style="margin-bottom: 4rpx;">
+      <view class="todo-view-title" catch:tap="toPay">微信支付</view>
+    </view>
+    <view class="todo-view" style="margin-bottom: 4rpx;">
+      <view class="todo-view-title" catch:tap="toTestExample">toTestExample</view>
+    </view>
+    <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;margin-bottom: 4rpx;">
+      <view class="todo-view-title ">标准版</view>
+      <view class="todo-view-title" style="display: flex;justify-content:space-between;align-items: center;">
+        <image src="{{imageUrl + 'diamond.png'}}" style="width:40rpx;height:40rpx; margin-right: 10rpx;" />
+        升级专业版
+      </view>
+    </view>
+    <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;margin-bottom: 4rpx;">
+      <view class="todo-view-title">{{$t['recommendedGifts']}}</view>
+      <view style="font-size: 12px;color: grey;">积分：3500</view>
+    </view>
+  </view>
+
+</view>
+
+<!-- 待办 -->
+<view style="background-color:#f8f9fd;border-radius:40rpx 40rpx 0rpx 0rpx;margin-top: -57rpx;">
+
+
   <!-- <view style="height: 39rpx;"></view>
   <view class="todo-view">
     <view class="todo-view-title" catch:tap="register">{{$t['registerCommany']}}</view>
   </view> -->
   <view style="height: 30rpx;"></view>
-  <view class="todo-view">
-    <view class="todo-view-title" catch:tap="toSetting">{{$t['settingCommany']}}</view>
-  </view>
 
-  <view style="height: 30rpx;"></view>
-  <view class="todo-view">
-    <view class="todo-view-title" catch:tap="toPay">微信支付</view>
-  </view>
-  <view style="height: 30rpx;"></view>
-  <view class="todo-view">
-    <view class="todo-view-title" catch:tap="toTestExample">toTestExample</view>
-  </view>
-  
-  <view style="height: 30rpx;"></view>
-  <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;">
-    <view class="todo-view-title ">标准版</view>
 
-    <view class="todo-view-title" style="display: flex;justify-content:space-between;align-items: center;">
-      <image src="{{imageUrl + 'diamond.png'}}" style="width:40rpx;height:40rpx; margin-right: 10rpx;" />
-      升级专业版
-    </view>
-  </view>
   <view style="height: 30rpx;"></view>
-  <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;">
-    <view class="todo-view-title">{{$t['recommendedGifts']}}</view>
-    <view style="font-size: 12px;color: grey;">积分：3500</view>
-  </view>
+
   <view style="height: 59rpx;"></view>
   <view style="padding: 30rpx;">
     <dk-button style="width: 100%; background: red;" size="large" type="danger" bind:tap="logout">退出 </dk-button>

pages/mine/mine.wxss

@@ -1,25 +1,25 @@
 page {
 	background-color: #f8f9fd;
-  }
-  
-  .head {
-   
-  
-	z-index: 1; 
+}
+
+.head {
+
+
+	z-index: 1;
 	height: 384rpx;
-	width: 100%; 
+	width: 100%;
 	background: #A51006;
-  }
-  
-  .head-center {
+}
+
+.head-center {
 	position: absolute;
 	width: 78rpx;
 	height: 80rpx;
 	left: 39rpx;
 	top: 204rpx;
-  }
-  
-  .nick-name {
+}
+
+.nick-name {
 	width: 70% !important;
 	position: absolute;
 	width: 64rpx;
@@ -32,11 +32,13 @@ page {
 	font-size: 28rpx;
 	line-height: 45rpx;
 	color: #FFFFFF;
-  }
-  .head-name {
+}
+
+.head-name {
 	margin-left: 23rpx;
-  }
-  .store{
+}
+
+.store {
 	position: absolute;
 	width: 364rpx;
 	height: 34rpx;
@@ -48,72 +50,72 @@ page {
 	font-size: 24rpx;
 	line-height: 34rpx;
 	color: white;
-  } 
-  
-  .setting {
+}
+
+.setting {
 	text-align: center;
 	padding: 20rpx;
-  }
-  
-  .head-center-ercode {
+}
+
+.head-center-ercode {
 	width: 30rpx;
 	height: 30rpx;
-  }
-  
-  .wx-avatar {
+}
+
+.wx-avatar {
 	overflow: hidden;
 	display: block;
 	width: 80rpx;
 	height: 80rpx;
 	border-radius: 50%;
 	border: 1px solid #95a8cb;
-  }
-  
-  .applications {
+}
+
+.applications {
 	color: #fff;
 	margin-top: 70rpx;
 	width: 100%;
-  }
-  
-  .application-block {
+}
+
+.application-block {
 	width: 25%;
 	text-align: center;
 	float: left;
-  }
-  
-  .application-number {
+}
+
+.application-number {
 	display: flex;
 	justify-content: center;
-  }
-  
-  .application-name {
+}
+
+.application-name {
 	display: flex;
 	font-size: 25rpx;
 	font-family: 'PingFang SC';
 	justify-content: center;
 	margin-top: 5rpx;
-  }
-  
-  .panel-class {
+}
+
+.panel-class {
 	margin-bottom: 20rpx;
-  }
-  
-  .menu-class {
+}
+
+.menu-class {
 	background: white;
 	justify-content: center;
-  }
-  
-  
-  
-  
-  /* 沈博 2022年7月29日14:37:16 */
-  .mb-left {
+}
+
+
+
+
+/* 沈博 2022年7月29日14:37:16 */
+.mb-left {
 	width: 200px;
 	display: flex;
 	align-items: center;
-  }
-  
-  .notice-view {
+}
+
+.notice-view {
 	width: 45rpx;
 	height: 45rpx;
 	background: #FFFFFF;
@@ -123,40 +125,39 @@ page {
 	align-items: center;
 	justify-content: center;
 	position: relative;
-  }
-  
-  .todo-view {
-	margin-left: 34rpx;
-	width: calc(100% - 68rpx - 48rpx);
+}
+
+.todo-view {
+	position: relative;
 	background: #FFFFFF;
 	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
 	border-radius: 15rpx;
 	padding: 24rpx;
 	/* margin-top: 35rpx; */
-	z-index: 2;
-  }
-  
-  .todo-view-title {
+	z-index: 22;
+}
+
+.todo-view-title {
 	font-style: normal;
 	font-weight: 500;
 	font-size: 16px;
 	font-family: 'PingFang SC';
-  }
-  
-  .todo-view-app {
+}
+
+.todo-view-app {
 	padding-top: 24rpx;
 	display: -webkit-box;
 	overflow: auto;
 	width: 100%;
-  }
-  
-  .todo-view-app-item {
+}
+
+.todo-view-app-item {
 	width: 25%;
 	display: grid;
 	justify-items: center;
-  }
-  
-  .todo-view-app-item-icon {
+}
+
+.todo-view-app-item-icon {
 	width: 66rpx;
 	height: 66rpx;
 	/* background-color: #B280E4; */
@@ -165,9 +166,9 @@ page {
 	justify-content: center;
 	border-radius: 50%;
 	position: relative;
-  }
-  
-  .todo-view-app-item-icon-tip {
+}
+
+.todo-view-app-item-icon-tip {
 	position: absolute;
 	width: 26rpx;
 	height: 26rpx;
@@ -183,9 +184,9 @@ page {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-  }
-  
-  .todo-view-app-item-name {
+}
+
+.todo-view-app-item-name {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 14px;
@@ -193,33 +194,31 @@ page {
 	/* font-family: 'SimSun'; */
 	color: #1B365D;
 	margin-top: 10rpx;
-  }
-  
-  .helper-view {
-	margin-left: 34rpx;
-	width: calc(100% - 68rpx - 48rpx);
+}
+
+.helper-view {
 	background: #FFFFFF;
 	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
 	border-radius: 15rpx;
 	padding: 24rpx;
 	margin-top: 30rpx;
-  }
-  
-  .helper-view-header {
+}
+
+.helper-view-header {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-  }
-  
-  .helper-view-content {
+}
+
+.helper-view-content {
 	display: flex;
 	flex-flow: wrap;
 	justify-content: space-between;
 	margin-top: 44rpx;
-  }
+}
 
-  
-  .help-view-content-item {
+
+.help-view-content-item {
 	border-radius: 15rpx;
 	position: relative;
 	display: grid;
@@ -228,13 +227,13 @@ page {
 	height: 108rpx;
 	background: #F8F8F8;
 	filter: blur(var(--filterBlur--));
-  }
-  
-  .help-view-content-item:nth-child(n+4) {
+}
+
+.help-view-content-item:nth-child(n+4) {
 	margin-top: 12rpx;
-  }
-  
-  .help-view-content-item-absolute {
+}
+
+.help-view-content-item-absolute {
 	color: #1B365D;
 	background-color: #EBEEF3;
 	font-size: 10px;
@@ -246,10 +245,10 @@ page {
 	position: absolute;
 	right: 4.3rpx;
 	top: 4.3rpx;
-  
-  }
-  
-  .help-view-content-item-important {
+
+}
+
+.help-view-content-item-important {
 	font-weight: 600;
 	font-size: 16px;
 	font-family: 'PingFang SC';
@@ -257,41 +256,41 @@ page {
 	justify-content: center;
 	display: flex;
 	align-items: center;
-  }
-  
-  .help-view-content-item-important-small {
+}
+
+.help-view-content-item-important-small {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
 	font-family: 'PingFang SC';
-  }
-  
-  .help-view-content-item-text {
+}
+
+.help-view-content-item-text {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
 	color: #95A8CB;
 	text-align: center;
 	font-family: 'PingFang SC';
-  }
-  
-  
-  .mine-tabs-custom-class {
+}
+
+
+.mine-tabs-custom-class {
 	display: none !important;
-  }
-  
-  .van-tabs__wrap {
+}
+
+.van-tabs__wrap {
 	display: none !important;
-  }
-  
-  .swiper-controller {
+}
+
+.swiper-controller {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	padding: 39rpx 38% 0 38%;
-  }
-  
-  .swiper-controller>view:nth-child(n) {
+}
+
+.swiper-controller>view:nth-child(n) {
 	background: #D1DCF1;
 	border-radius: 50%;
 	width: 35rpx;
@@ -299,66 +298,65 @@ page {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-  }
-  
-  
-  .task-progress {
-	margin-left: 34rpx;
-	width: calc(100% - 68rpx);
+}
+
+
+.task-progress {
 	background: #FFFFFF;
 	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
 	border-radius: 15rpx;
 	margin-top: 30rpx;
-  }
-  
-  .task-progress-header {
+}
+
+.task-progress-header {
 	display: flex;
 	background: linear-gradient(90.12deg, #9BCBEB 0.13%, #D9F0FF 99.92%);
 	padding: 24rpx;
 	border-radius: 15rpx 15rpx 0px 0px;
 	align-items: center;
 	justify-content: space-between;
-  }
-  
-  .task-progress-header-name {
+}
+
+.task-progress-header-name {
 	font-style: normal;
 	font-weight: 500;
 	font-size: 16px;
 	color: #FFFFFF;
 	font-family: 'PingFang SC';
-  }
-  
-  .task-progress-content {
+}
+
+.task-progress-content {
 	display: flex;
 	justify-content: space-between;
 	padding: 24rpx 24rpx 0 24rpx;
 	position: relative;
-  }
-  .task-progress-content-left {
+}
+
+.task-progress-content-left {
 	filter: blur(var(--filterBlur--));
 	padding: 20rpx 0;
-  }
-  
-  .task-progress-content-left>view:nth-child(1) {
+}
+
+.task-progress-content-left>view:nth-child(1) {
 	font-style: normal;
 	font-weight: 600;
 	font-family: 'PingFang SC';
 	font-size: 25px;
 	color: #1B365D;
-  }
-  
-  
-  .task-progress-content-left>view:nth-child(2) {
+}
+
+
+.task-progress-content-left>view:nth-child(2) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 14px;
 	color: #95A8CB;
 	font-family: 'PingFang SC';
 	margin-top: 13rpx;
-  }
-  
-  
-  .task-progress-content-left>view:nth-child(3) {
+}
+
+
+.task-progress-content-left>view:nth-child(3) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
@@ -368,32 +366,34 @@ page {
 	line-height: 40rpx;
 	font-family: 'PingFang SC';
 	margin-top: 11rpx;
-  }
-  
-  .task-progress-content-left>view:nth-child(3)>view:nth-child(n), .task-progress-content-left>view:nth-child(3)>view:nth-child(n)>view:nth-child(n){
+}
+
+.task-progress-content-left>view:nth-child(3)>view:nth-child(n),
+.task-progress-content-left>view:nth-child(3)>view:nth-child(n)>view:nth-child(n) {
 	display: flex;
 	align-items: center;
-  }
-  
-  .task-progress-content-left>view:nth-child(3)>view:nth-child(2){
+}
+
+.task-progress-content-left>view:nth-child(3)>view:nth-child(2) {
 	margin-left: 19rpx;
-  }
-  
-  .task-progress-content-right{
+}
+
+.task-progress-content-right {
 	padding: 20rpx 0;
 	display: grid;
 	filter: blur(var(--filterBlur--));
-  }
-  .task-progress-content-right>view:nth-child(1) {
+}
+
+.task-progress-content-right>view:nth-child(1) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 14px;
 	color: #1B365D;
 	text-align: right;
 	font-family: 'PingFang SC';
-  }
-  
-  .task-progress-content-right>view:nth-child(2) {
+}
+
+.task-progress-content-right>view:nth-child(2) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
@@ -401,33 +401,55 @@ page {
 	margin-bottom: 12rpx;
 	text-align: right;
 	font-family: 'PingFang SC';
-  }
-  
-  .task-progress-content-right>view:nth-child(3) {
+}
+
+.task-progress-content-right>view:nth-child(3) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
 	color: #95A8CB;
 	text-align: right;
 	font-family: 'PingFang SC';
-  }
-  
-  .small-cny{
+}
+
+.small-cny {
 	font-size: 12px;
 	color: green;
-  }
-   .small-cny_red{
+}
+
+.small-cny_red {
 	font-size: 12px;
 	color: red;
-  }
-  .small-small-font{
+}
+
+.small-small-font {
 	font-size: 10px;
 	line-height: 16px;
-  }
-  .company{
+}
+
+.company {
 	width: 100%;
-	position: absolute;
+	position: fixed;
 	left: 40rpx;
-	top: 120rpx;
+	top: 60rpx;
 	color: #F8F9FD;
-  }
+}
+
+.company-change-class {
+	margin-right: 10rpx;
+	font-size: 16px;
+	font-weight: 500;
+}
+
+.head-image {
+	width: 100%;
+	position: fixed;
+	height: 580rpx;
+}
+
+.content {
+	margin-left: 40rpx;
+	margin-right: 40rpx;
+	width: calc(100% - 80rpx);
+	background: #FFFFFF;
+}