员工

ghsApp/src/admin/staff/list.vue

@@ -28,19 +28,19 @@
 									</div>
 
 									<div class="status-list">
-										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">开单 {{item.kdAmount}}</span>
+										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">业绩 {{item.kdAmount}}</span>
 									</div>
-
 								</div>
 							</div>
 							<div class="list-det-right">
-								<div @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
-								<i class="iconfont iconbianji"></i>
-								</div>
 								<!-- 删除 -->
-								<div v-if="item.super == 0" @click="delModalFn(item)">
+								<div v-if="item.super == 0 && item.id != loginInfo.shopAdminId" @click="delModalFn(item)">
 									<i class="iconfont iconshanchu1"></i>
 								</div>
+								<!-- 修改 -->
+								<div @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
+								<i class="iconfont iconbianji"></i>
+								</div>
 							</div>
 						</div>
 					</div>
@@ -136,7 +136,7 @@ import TimeaxisItem from '@/admin/home/components/plugin/timeaxis-item'
 import AppWrapperEmpty from '@/components/app-wrapper-empty'
 import ModalModule from '@/components/plugin/modal'
 import { list } from '@/mixins'
-// api
+import { mapGetters } from "vuex"
 import { getStaffList, delStaff, getRoleList, addRole, updateRole, delRole, getLogList } from '@/api/staff'
 export default {
 	name: 'staff-list',
@@ -180,6 +180,9 @@ export default {
 			uni.stopPullDownRefresh()
 		})
 	},
+	computed: {
+		...mapGetters({ loginInfo: "getLoginInfo" }),
+	},
 	onReachBottom() {
 		if (!this.list.finished) {
 			this._list().then(res => {

hdApp/src/admin/billing/affirmGoods.vue

@@ -60,10 +60,10 @@
 <!--					</tui-list-cell>-->
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title ">运费</view>
-						<input type="number" placeholder="如果鲜花价格已经包含运费，请留空" v-model="freight" placeholder-class="tui-placeholder">
+						<input type="number" placeholder="留空免运费" v-model="freight" placeholder-class="tui-placeholder">
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title ">结算方式</view>
+						<view class="tui-title ">付款方式</view>
 						<button class="admin-button-com mini-btn" :class="payType==res.id?'blue':'default'" style="margin-right: 10rpx"
 														@tap="payType=res.id"  v-for="(res,i) in getDictionariesInfo.htPayWayOption">
 							{{ res.name }}
@@ -158,9 +158,12 @@ export default {
 		},
 		//确定开单
 		affirmFormSubmit(){
-			if(this.clientInfo==''){uni.showToast({title:'请选择客户！',icon:'none'});return;}
+			//if(this.clientInfo==''){uni.showToast({title:'请选择客户！',icon:'none'});return;}
 			// if(this.packingMoney==''){uni.showToast({title:'请输入包装费！',icon:'none'});return;}
-			if(this.payType==null){uni.showToast({title:'请选择结算方式！',icon:'none'});return;}
+			if(this.payType==null){
+				uni.showToast({title:'请选择支付方式！',icon:'none'})
+				return
+			}
 			const product = this.selectList.map(ele => {
 				if(ele.goodsStyle==1){
 					return {"goodsId":ele.id,"goodsStyleId":ele.goodsStyleList[ele.goodsStyleSelectIndex].id,"goodsNum":ele.bigCount}

hdApp/src/admin/home/workbench.vue

@@ -487,7 +487,7 @@ export default {
       .iconfont {
         font-size: 24px;
         margin-left: 10px;
-        margin-bottom: 4upx;
+        margin-bottom: 6upx;
       }
     }
   }

hdApp/src/admin/staff/list.vue

@@ -27,17 +27,16 @@
 									</div>
 
 									<div class="status-list">
-										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">开单 {{item.kdAmount}}</span>
+										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">业绩 {{item.kdAmount}}</span>
 									</div>
 
 								</div>
 							</div>
 							<div class="list-det-right">
 								<div  @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
-								<i class="iconfont iconbianji"></i>
+									<i class="iconfont iconbianji"></i>
 								</div>
-								<!-- 删除 -->
-								<div v-if="item.super == 0" @click="delModalFn(item)">
+								<div v-if="item.super == 0 && item.id != loginInfo.shopAdminId" @click="delModalFn(item)">
 									<i class="iconfont iconshanchu1"></i>
 								</div>
 							</div>
@@ -135,7 +134,7 @@ import TimeaxisItem from '@/admin/home/components/plugin/timeaxis-item'
 import AppWrapperEmpty from '@/components/app-wrapper-empty'
 import ModalModule from '@/components/plugin/modal'
 import { list } from '@/mixins'
-// api
+import { mapGetters } from "vuex"
 import { getStaffList, delStaff, getRoleList, addRole, updateRole, delRole, getLogList } from '@/api/staff'
 export default {
 	name: 'staff-list',
@@ -179,6 +178,9 @@ export default {
 			uni.stopPullDownRefresh()
 		})
 	},
+	computed: {
+		...mapGetters({ loginInfo: "getLoginInfo" }),
+	},
 	onReachBottom() {
 		if (!this.list.finished) {
 			this._list().then(res => {
@@ -188,9 +190,7 @@ export default {
 			uni.stopPullDownRefresh()
 		}
 	},
-	onLoad: function() {
-		// this.init()
-	},
+	onLoad: function() {},
 	methods: {
 		async init() {
 			this._list()

mallApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "http://api.shop.theflorist.cn",
+    "apiHost": "https://api.shop.theflorist.cn",
     "imgHost": "https://img.theflorist.cn",
     "name":"中花卉"
   }

mallApp/src/pages/callback/index.vue

@@ -130,7 +130,6 @@
     </alert-module>
   </div>
 </template>
-
 <script>
 /** *
  * 页面状态
@@ -173,14 +172,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({ shopUser: "getShopUser" }),
-    isYeBtnShow() {
-      if (this.$util.isEmpty(this.shopUser)) {
-        return false;
-      }
-      console.log('this option ...',this.option)
-      return this.shopUser.userAsset.balance > this.option.totalPrice;
-    }
+    ...mapGetters({ shopUser: "getShopUser" })
   },
   onLoad() {},
   methods: {
@@ -296,7 +288,6 @@ export default {
           this.contentClass = "awaitPayYe";
           break;
       }
-
       uni.setNavigationBarTitle({
         title: this.pageTit
       });
@@ -419,4 +410,4 @@ export default {
     }
   }
 }
-</style>
+</style>

mallApp/src/pages/order/detail.vue

@@ -132,7 +132,7 @@
           <span class="app-size-40">{{ data.actPrice }}</span>
         </span>
       </div>
-      <template v-if="data.status == 0">
+      <template v-if="data.status == 1">
         <button class="button-com red" @click="payFn">立即支付</button>
       </template>
       <template v-else-if="data.status == 5">