优化

ghsApp/src/admin/item/list2.vue

@@ -9,7 +9,7 @@
 					<app-search-module v-model="globalPy" ref="globalSearchRef" placeholder="这里搜索" @input="globalSearch"/>
 				</view>
 				<view style="padding:0 0upx 0 8upx;" >
-					<button class="admin-button-com middle blue" @click.stop="openOption">{{globalLookStock==0 ? '条件筛选' : globalLookStock==1 ? '有库存' : '没库存' }}</button>
+					<button class="admin-button-com middle blue" @click.stop="openOption">{{globalLookStock==0 ? '库存筛选' : globalLookStock==1 ? '有库存' : '没库存' }}</button>
 				</view>
 				<view style="padding:0 0upx 0 8upx;" >
 					<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>

hdApp/src/admin/goods/list.vue

@@ -2,11 +2,13 @@
   <view class="app-content">
 		<view class="input-wrap" >
 			<view class="search-bar">
-				<app-search-module v-model="searchText" placeholder="这里搜索" @input="searchFn" />
+				<app-search-module v-model="searchText" placeholder="输入名称" @input="searchFn" />
 			</view>
 			<view style="padding-left:10upx;">
-        <button class="admin-button-com middle blue" style="margin-right:8upx;" @click="selectFlowerNumFn()">支数查询</button>
-        <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="addGoods()">新增</button>
+        <button class="admin-button-com middle blue" style="margin-right:8upx;" @click.stop="openPriceOption">{{lookStock==0 ? '价格' : lookStock==1 ? '有价' : '无价' }}</button>
+        <button class="admin-button-com middle blue" style="margin-right:8upx;" @click.stop="openOption">{{lookStock==0 ? '库存' : lookStock==1 ? '有的' : '没有' }}</button>
+        <button class="admin-button-com middle blue" style="margin-right:8upx;" @click="selectFlowerNumFn()">支数</button>
+        <button class="admin-button-com middle blue" @click="addGoods()">新增</button>
 			</view>
 		</view>
     <view class="app-middle">
@@ -22,11 +24,9 @@
               <view class="goods-list" v-for="(goodsItem, idx) in list.data" :key="idx">
                 <view class="goods-list-top" @click="edit(goodsItem.id)">
                   <view class="img-blo">
-
                     <view v-if="goodsItem.stock <= 0" class="sold-out">
                       <view class="sold-out-xj">已下架</view>
                     </view>
-
                     <img :src="goodsItem.smallCover" mode="aspectFit" />
                   </view>
                   <view class="goods-det">
@@ -34,8 +34,8 @@
                       <view class="goods-name" style="font-size:29upx;font-weight:bold;	overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:350upx;">{{ goodsItem.name||'' }}</view>
                     </view>
                     <view class="operate-wrap" style="margin-bottom:15upx;">
-                      <view class="goods-price" style="font-size:23upx;" v-if="goodsItem.priceType == 1">￥{{ goodsItem.price?parseFloat(goodsItem.price):0 }}</view>
-                      <view class="goods-price" style="font-size:23upx;" v-else>-</view>
+                      <view class="goods-price" style="font-size:26upx;" v-if="goodsItem.priceType == 1">￥{{ goodsItem.price?parseFloat(goodsItem.price):0 }}</view>
+                      <view class="goods-price" style="font-size:26upx;" v-else>---</view>
                     </view>
                     <view class="operate-wrap">
                       <view style="font-size:23upx;">
@@ -72,6 +72,35 @@
       </view>
     </uni-popup>
 
+    
+    <uni-popup ref="searchPriceOptionRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="display:flex;padding:80upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+				<view @tap.stop="changePriceStyle(2)" style="margin-bottom:20upx;">
+					<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:150upx;text-align:center;font-size:38upx;">没价格</view>
+				</view>
+				<view @tap.stop="changePriceStyle(1)" style="margin-bottom:20upx;">
+					<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:150upx;text-align:center;font-size:38upx;">有价格</view>
+				</view>
+				<view @tap.stop="changePriceStyle(0)" style="margin-bottom:20upx;">
+					<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:150upx;text-align:center;font-size:38upx;">重新选</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="searchOptionRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="display:flex;padding:80upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+				<view @tap.stop="changeHasStock(2)" style="margin-bottom:20upx;">
+					<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:150upx;text-align:center;font-size:38upx;">没库存</view>
+				</view>
+				<view @tap.stop="changeHasStock(1)" style="margin-bottom:20upx;">
+					<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:150upx;text-align:center;font-size:38upx;">有库存</view>
+				</view>
+				<view @tap.stop="changeHasStock(0)" style="margin-bottom:20upx;">
+					<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:150upx;text-align:center;font-size:38upx;">重新选</view>
+				</view>
+			</view>
+		</uni-popup>
+
   </view>
 </template>
 <script>
@@ -105,7 +134,9 @@ export default {
       autoLoad:false,
       flowerNum:0,
       flowerNumList:[{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99},{num:0,name:'取消'}],
-      searchText:''
+      searchText:'',
+      lookStock:0,
+      lookPrice:0
     };
   },
 
@@ -124,7 +155,20 @@ export default {
     init(){
       this.getCategoryData()
     },
-
+		changeHasStock(check){
+			this.lookStock = check
+			this.$refs.searchOptionRef.close()
+		},
+		openOption(){
+			this.$refs.searchOptionRef.open('top')
+		},
+    changePriceStyle(){
+			this.lookPrice = check
+			this.$refs.searchPriceOptionRef.close()
+    },
+    openPriceOption(){
+      this.$refs.searchPriceOptionRef.open('top')
+    },
 		moreToDo(item){
 			let that=this;
 			let doList = ['打1个标签', '打2个标签','打5个标签', '打10个标签', '销售记录', '设置为散花']

hdApp/src/admin/item/list2.vue

@@ -9,7 +9,7 @@
 					<app-search-module v-model="globalPy" ref="globalSearchRef" placeholder="这里搜索" @input="globalSearch"/>
 				</view>
 				<view style="padding:0 0upx 0 8upx;" >
-					<button class="admin-button-com middle blue" @click.stop="openOption">{{globalLookStock==0 ? '条件筛选' : globalLookStock==1 ? '有库存' : '没库存' }}</button>
+					<button class="admin-button-com middle blue" @click.stop="openOption">{{globalLookStock==0 ? '库存筛选' : globalLookStock==1 ? '有库存' : '没库存' }}</button>
 				</view>
 				<view style="padding:0 0upx 0 8upx;" >
 					<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>

mallApp/src/pages/billing/affirmGhs.vue

@@ -116,7 +116,7 @@
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<textarea style="height: 100upx" v-model="form.remark" placeholder="这里写备注"></textarea>
+						<textarea style="height: 100upx;z-index:0" v-model="form.remark" placeholder="这里写备注"></textarea>
 					</tui-list-cell>
 
 				</view>

mallApp/src/pages/callback/index.vue

@@ -49,17 +49,7 @@
           <img :src="`${constant.imgUrl}/retail/images/extension.png`" alt mode="widthFix" />
         </view>
       </view>
-
-      <!-- #ifdef MP-WEIXIN -->
-      <view style="width:100%;margin-top:25upx;text-align:center;">
-        <view style="background-color: white;margin:0 auto;width:676upx;">
-          <ad-custom unit-id="adunit-510957a20b72a06b" style=""></ad-custom>
-        </view>
-      </view>
-      <!-- #endif -->
-
     </view>
-
   </view>
 </template>
 <script>

mallApp/src/pages/order/detail.vue

@@ -136,7 +136,7 @@ import AppCouponSel from "@/components/app-coupon-sel";
 import { getDetail } from "@/api/order";
 import { getShopUser } from "@/utils/auth";
 export default {
-  name: "order-detail",
+  name: "detail",
   components: { ListModule, AppCouponSel,orderItem },
   data() {
     return {
@@ -212,11 +212,12 @@ export default {
       });
     },
     payFn() {
-      let data = { orderSn: this.data.orderSn, totalPrice: this.data.prePrice, couponId: 0 }
-      this.$util.pageTo({ url: "/pages/callback/index", query: { pageStatus: 1, id: this.data.id, ...data,hdId:this.data.hdId } })
-    },
-    evealFn() {
-      this.$util.pageTo({ url: "/pages/order/comment", query: { id: this.data.id } })
+      let account = this.option.account?this.option.account:0
+      let orderSn = this.data.orderSn
+      let totalPrice = this.data.prePrice
+      let id = this.data.id
+      let hdId = this.data.hdId
+      this.$util.pageTo({ url: "/pages/callback/index?account="+account+'&orderSn='+orderSn+'&totalPrice='+totalPrice+'&pageStatus=1&id='+id+'&hdId='+hdId})
     }
   }
 };

mallApp/src/pages/order/list.vue

@@ -146,7 +146,7 @@ export default {
       })
     },
     goToDetail (val) {
-      uni.navigateTo({ url: '/pages/order/detail?id=' + val.id })
+      uni.navigateTo({ url: '/pages/order/detail?id=' + val.id+'&account='+val.shopId+'&hdId='+val.hdId })
     }
   }
 }