小菊控制

ghsApp/src/admin/billing/affirm.vue

@@ -7,27 +7,23 @@
           <view class="commodity-view">
             <view class="commodity-list">
               <view class="commodity-item" v-for="(item, index) in selectList" :key="index">
-                <image class="item-icon" :src="item.cover" alt="商品图" />
+                <image class="item-icon" :src="item.cover" alt="" />
                 <view class="item-info">
                   <view class="info-line">
                     <text class="item-name">{{ item.itemName }}</text>
                     <text class="item-price">
                       <text class="unit">¥</text>
                       <text class="price">
-                        {{ item.userPrice }}
+                        {{ parseFloat(item.userPrice)||0 }}
                       </text>
                     </text>
                   </view>
                   <view class="info-line">
                     <text class="item-type"></text>
                     <text class="item-count">
-                      <text v-if="item.bigCount > 0 || item.smallCount > 0">{{
-                        `${item.bigCount}`
-                      }}</text>
+                      <text v-if="item.bigCount > 0 || item.smallCount > 0">{{`${item.bigCount}`}}</text>
                       <text v-if="item.smallCount > 0">/</text>
-                      <text v-if="item.smallCount > 0">{{
-                        `${item.smallCount}`
-                      }}</text>
+                      <text v-if="item.smallCount > 0">{{`${item.smallCount}`}}</text>
                     </text>
                   </view>
                 </view>
@@ -35,8 +31,7 @@
             </view>
             <view class="summary-bar">
               <view class="operate-view" @click="gobackEvent">
-                <text class="iconfont icongouwuche"></text>
-                重选花材
+                <text class="iconfont icongouwuche"></text>重选花材
               </view>
               <view class="describe-view">
                 共{{ selectList.length }}种，合计 ¥<text class="price">{{ allPrice }}</text>
@@ -309,8 +304,6 @@ export default {
         if(res.code == 1){
           //删除记忆
           this.removeMemory(that.option.customId)
-          //删除小菊的记忆
-          uni.removeStorageSync("xj"+params.customId)
           const {data: { id, orderSn },} = res;
           this.$util.pageTo({ url: '/admin/billing/result',type:2,query: {orderId:id,orderSn:orderSn}})
         }

ghsApp/src/admin/billing/index.vue

@@ -5,7 +5,7 @@
 				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFn" />
 			</view>
 			<view style="float:right">
-				<button class="admin-button-com middle blue" @click="removeMemory()">清除花材</button>
+				<button class="admin-button-com middle blue" @click="removeMemory(option.customId)">清除花材</button>
 			</view>
 		</view>
 

ghsApp/src/admin/item/xj.vue

@@ -31,8 +31,8 @@
 					</view>
 					<view>
 						<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
-						<button class="admin-button-com big default" @click="goBack()" style="margin-left:65rpx;padding:30rpx 55rpx 30rpx 55rpx;">返回</button>
-						<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:65rpx;padding:30rpx 65rpx; 30rpx 65rpx;" >确认</button>
+						<button class="admin-button-com big default" @click="goBack()" style="margin-left:58rpx;padding:30rpx 55rpx 30rpx 55rpx;">返回</button>
+						<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58rpx;padding:30rpx 65rpx; 30rpx 65rpx;" >确认</button>
 					</view>
 				</view>
 			</block>

ghsApp/src/mixins/product.js

@@ -149,6 +149,10 @@ export default {
 		removeMemory(customId){
 			if(customId){
 				uni.removeStorageSync('selectList'+this.pageType+'_custom_'+customId);
+
+				//删除小菊的记忆
+				uni.removeStorageSync("xj"+customId)
+
 			}else{
 				uni.removeStorageSync('selectList'+this.pageType);
 			}

ghsApp/src/pagesClient/member/detail.vue

@@ -45,7 +45,7 @@
                 <view>
                   {{userInfo.name}} {{userInfo.mobile}}
                 </view>
-                <view style="margin-bottom:20rpx;color:#333333">店长：{{userInfo.superInfo.name}}</view>
+                <view style="margin-bottom:20rpx;color:#333333">店长：{{userInfo.superInfo.name||''}}</view>
                 <view>
                   {{userInfo.address}}
                 </view>
@@ -56,6 +56,16 @@
             </view>
           </view>
       </view>
+
+    <div class="module-com tabs-wrap">
+      <div class="tabs-list" v-for="(item, index) in tabsData" :key="index" @click="pageTo(item)">
+        <div class="tabs-img">
+          <img :src="item.img" alt mode="widthFix" />
+        </div>
+        <div class="tabs-name">{{ item.name }}</div>
+      </div>
+    </div>
+
       <view class="module-com user-open_bx">
         <view class="input-line-wrap">
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/pagesArrears/details',query: {id: userInfo.id}})">
@@ -64,11 +74,6 @@
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/clear/customList',query: {customId: userInfo.id}})">
               <div class="tui-title">历史帐单</div>
             </tui-list-cell>
-
-            <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="changeLevel()">
-              <div class="tui-title">修改等级</div>
-            </tui-list-cell>
-
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">允许欠款</div>
               <div class="switch_bx">
@@ -122,12 +127,45 @@ export default {
         debt: 0,
         black: 1,
       },
-      discount:null
+      discount:null,
+      tabsData: [
+        {
+          name: "开单",
+          img: `${this.$constant.imgUrl}/retail/member/tab-icon-4.png`,
+          funtion: () => {
+			      this.createOrder()
+          }
+        },
+        {
+          name: "等级设置",
+          img: `${this.$constant.imgUrl}/retail/member/tab-icon-1.png`,
+          funtion: () => {
+            this.changeLevel()
+          }
+        },
+        {
+          name: "发红包",
+          img: `${this.$constant.imgUrl}/retail/member/tab-icon-2.png`,
+          funtion: () => {
+            this.$msg("开发中");
+          }
+        },
+        {
+          name: "重置密码",
+          img: `${this.$constant.imgUrl}/retail/member/tab-icon-6.png`,
+          funtion: () => {
+			      this.$msg("开发中")
+          }
+        }
+      ]
     };
   },
   computed: {},
   onLoad() {},
   methods: {
+    createOrder(){
+      this.$util.pageTo({url: '/admin/billing/index',type:2,query: {customId: this.userInfo.id,customName:this.userInfo.name}})
+    },
     changeLevel(){
 
       let that = this
@@ -416,6 +454,30 @@ export default {
     }
   }
 }
+.tabs-wrap {
+  padding: 40px 10px;
+  @include disFlex(center, center);
+  flex-wrap: wrap;
+  .tabs-list {
+    width: 25%;
+    margin-bottom: 10px;
+    text-align: center;
+    .tabs-img {
+      width: 50px;
+      height: 50px;
+      margin: 0 auto 14px;
+      img {
+        height: 100%;
+      }
+    }
+    .tabs-name {
+      color: $fontColor2;
+    }
+    &:nth-child(n + 5) {
+      margin-bottom: 0;
+    }
+  }
+}
 .user-open_bx {
   margin-top: 20px;
   padding: 0;

hdApp/src/admin/billing/affirmGhs.vue

@@ -200,7 +200,7 @@
 										<text class="item-price">
 											<text class="unit">¥</text>
 											<text class="price">
-												{{ item.bigPrice }}
+												{{ parseFloat(item.bigPrice)||0 }}
 											</text>
 										</text>
 									</view>
@@ -218,7 +218,7 @@
 								<text class="iconfont icongouwuche"></text>
 								修改花材
 							</view>
-							<view class="describe-view">共{{ allCountFun.bigLength }}/{{ allCountFun.smallLength }}种,合计 ¥<text class="price">{{ allPriceFun }}</text></view>
+							<view class="describe-view">共{{ allCountFun.bigLength }}扎,合计 ¥<text class="price">{{ allPriceFun }}</text></view>
 						</view>
 					</view>
 				</view>
@@ -497,8 +497,6 @@ export default {
 								self.pageTo({url: '/pagesPurchase/wechatPay',query:{orderSn,realPrice,id}, type: 2})
 								setTimeout(() => {
 									self.removeMemory(self.ghsInfo.id)
-									//删除小菊的记忆
-									uni.removeStorageSync("ghsXj"+params.ghsId)
 								}, 600)
 							}
 						});

hdApp/src/admin/ghsProduct/detail.vue

@@ -27,11 +27,11 @@
     </div>
       <div class="shop-express app-color-3">
 
-        <text>普通 {{parseFloat(productInfo.price)||0}}</text>
-        <text>青铜 {{parseFloat(productInfo.qtPrice)||0}}</text>
-        <text>白银 {{parseFloat(productInfo.byPrice)||0}}</text>
-        <text>黄金 {{parseFloat(productInfo.hjPrice)||0}}</text>
-        <text>钻石 {{parseFloat(productInfo.zsPrice)||0}}</text>
+        <text>普通 {{parseFloat(productInfo.originalInfo.price)||0}}</text>
+        <text>青铜 {{parseFloat(productInfo.originalInfo.qtPrice)||0}}</text>
+        <text>白银 {{parseFloat(productInfo.originalInfo.byPrice)||0}}</text>
+        <text>黄金 {{parseFloat(productInfo.originalInfo.hjPrice)||0}}</text>
+        <text>钻石 {{parseFloat(productInfo.originalInfo.zsPrice)||0}}</text>
 
       </div>
     <!-- 商品详情 -->
@@ -198,6 +198,9 @@ export default {
       @include disFlex(center, space-between);
       .tui-pro-title {
         width: 80%;
+        overflow: hidden;
+        text-overflow:ellipsis;
+        white-space: nowrap;
       }
       .tui-share-btn {
         display: block;

hdApp/src/mixins/product.js

@@ -223,6 +223,8 @@ export default {
 		removeMemory(ghsId){
 			if(ghsId){
 				uni.removeStorageSync('selectList'+this.pageType+'_ghs_'+ghsId);
+				//删除小菊的记忆
+				uni.removeStorageSync("ghsXj"+ghsId)
 			}else{
 				uni.removeStorageSync('selectList'+this.pageType);
 			}

hdApp/src/pagesPurchase/orderItem.vue

@@ -33,11 +33,12 @@
         </view>
         <view class="info-row">
           <text class="info-label"> 数量：</text>
-          <text class="info-value">{{ info.bigNum }}/{{info.smallNum}}</text>
+          <text v-if="info.smallNum > 0" class="info-value">{{ info.bigNum }}/{{info.smallNum}}</text>
+          <text class="info-value">{{info.bigNum}}</text>
         </view>
 
       </view>
-      <view class="item-price">¥{{ info.realPrice }} <text class="iconfont iconxiangyou"></text>
+      <view class="item-price">¥{{ parseFloat(info.actPrice)||0 }} <text class="iconfont iconxiangyou"></text>
       </view>
     </view>
   </view>

hdApp/src/pagesPurchase/purDetails.vue

@@ -142,7 +142,7 @@
           <view class="summary-bar">
             <view class="operate-view"></view>
             <view class="describe-view">
-              共{{ detailInfo.kindNum || 0 }}种, 共{{ detailInfo.bigNum }}扎{{detailInfo.smallNum}}支，合计 ¥<text class="price">{{ parseFloat(detailInfo.itemPrice)||0 }}</text>
+              共{{ detailInfo.kindNum || 0 }}种 {{ detailInfo.bigNum }}扎<text v-if="detailInfo.smallNum>0">{{detailInfo.smallNum}}支</text>，合计 ¥<text class="price">{{ parseFloat(detailInfo.itemPrice)||0 }}</text>
             </view>
           </view>
         </view>

hdApp/src/pagesPurchase/xj.vue

@@ -27,8 +27,8 @@
 					</view>
 					<view>
 						<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
-						<button class="admin-button-com big default" @click="goBack()" style="margin-left:65rpx;padding:30rpx 55rpx 30rpx 55rpx;">返回</button>
-						<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:65rpx;padding:30rpx 65rpx; 30rpx 65rpx;" >确认</button>
+						<button class="admin-button-com big default" @click="goBack()" style="margin-left:58rpx;padding:30rpx 55rpx 30rpx 55rpx;">返回</button>
+						<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58rpx;padding:30rpx 65rpx; 30rpx 65rpx;" >确认</button>
 					</view>
 				</view>
 			</block>