体验

ghsApp/src/admin/home/workbench.vue

@@ -111,7 +111,7 @@
 				</div>
 			</template>
 		</modal-module>
-    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="EXPER_AUTH_SHOW" @experienceClick="experienceFun"></none-hd>
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="EXPER_AUTH_SHOW" @comfirm="experienceFun"></none-hd>
 	</div>
 </template>
 

ghsApp/src/api/order/index.js

@@ -17,7 +17,7 @@ export const getDetail = data => {
 	* 损耗生成订单
 	*/
 export const wastage = data => {
-	return https.post("/order/wastage", data);
+	return https.post("/wastage/create-order", data);
 };
 
 /** *

ghsApp/src/components/none-hd.vue

@@ -6,7 +6,18 @@
     ></image>
     <view class="no_data_text">{{title}}</view>
     <view class="freeApply" @click="apply">{{btnText}}</view>
-    <view class="experience" v-if="authShow" @click="experienceClick">体验</view>
+    <view class="experience" v-if="expreShow" @click="experienceClick">体验</view>
+    <view class="experFrame">
+      <view v-if="rightShow">
+        <input
+            v-model="experCode"
+            class="experInput"
+            placeholder="请输入体验码"
+          />
+        <text class="admin-button-com small blue" @click="rightClick">确定</text>
+      </view>
+    </view>
+
   </view>
 </template>
 
@@ -30,9 +41,17 @@ export default {
       default: false,
     }
   },
+  watch: {
+    authShow(val) {
+      this.expreShow = val
+    }
+  },
   data() {
     return {
       constant: this.$constant,
+      experCode: '',
+      expreShow: false,
+      rightShow: false
     };
   },
   methods: {
@@ -40,7 +59,12 @@ export default {
       this.$emit('bthClick')
     },
     experienceClick(){
-      this.$emit('experienceClick')
+      console.log('abc123')
+      this.rightShow = true
+      this.expreShow = false
+    },
+    rightClick() {
+      this.$emit('comfirm', this.experCode)
     }
   },
 };
@@ -85,5 +109,34 @@ export default {
     color: #fff;
     font-size: 30upx;
   }
+  &>.experFrame{
+    margin-top: 50upx;
+    height: 50upx;
+    &>view{
+      margin: 0 auto;
+      &>.experInput{
+        height: 70upx;
+        width: 250upx;
+        display: inline-block;
+        vertical-align: middle;
+        border-radius: 8upx;
+        background-color: #fff;
+        border: 1px solid #ccc;
+        color: #666;
+        padding-left: 20upx;
+        box-sizing: border-box;
+        text-align: left;
+      }
+      &>text{
+        display: inline-block;
+        line-height: 70upx;
+        padding: 0 20upx;
+        background-color: #3385FF;
+        vertical-align: middle;
+        font-size: 30upx;
+        margin-left: 20upx;
+      }
+    }
+  }
 }
 </style>

ghsApp/src/mixins/globalMixins.js

@@ -55,7 +55,7 @@ export default {
             this.AUTHORITY_SHOW = true;
             uni.hideTabBar()
             uni.setStorageSync('HOME_STATUS_STROAGE_SHOW', res.data.shopAdminId)
-            uni.setStorageSync('HOME_REFRESH', '1')
+            uni.setStorageSync('HOME_REFRESH', '2')
 					} else if (res.data.admin.openShop == '2' && res.data.shopAdminId == '0') {
             this.MODEL_TITLE = '已申请'
             this.MODEL_BTN_TEXT = '查看申请进度'
@@ -90,6 +90,12 @@ export default {
       this.MODEL_BTN_TEXT = '查看申请进度'
       this.AUTHORITY_SHOW = true
       uni.hideTabBar()
+    }
+    if (uni.getStorageSync('HOME_REFRESH') == '2') {
+      this.MODEL_TITLE = '您还没有开店哦'
+      this.MODEL_BTN_TEXT = '免费申请'
+      this.AUTHORITY_SHOW = true
+      uni.hideTabBar()
     }
 	},
 	methods: {
@@ -112,25 +118,17 @@ export default {
               status = '3'
             }
             uni.navigateTo({url:'/admin/home/result?status=' + status})
-            // this.$util.pageTo({
-            //   url: '/admin/home/result',
-            //   query: {
-            //     status
-            //   }
-            // })
           }).catch(err => {})
-          // this.$util.pageTo({
-          //   url: '/admin/home/result',
-          //   type: 2,
-          //   query: {
-          //     status: '2'
-          //   }
-          // })
       }
     },
-    experienceFun(){
+    experienceFun(experienceCode){
+      console.log(experienceCode)
+      if (this.$util.isEmpty(experienceCode)) {
+        this.$msg('请输入体验码')
+        return false
+      }
       /**姜枫 2021.04.30  小程序审核体验账号**/
-      postWxCode().then(subRes => {
+      postWxCode({experienceCode: experienceCode}).then(subRes => {
         if (this.$util.isEmpty(subRes)) {
           return false
         }
@@ -188,14 +186,7 @@ export default {
 	},
 	mounted() {
 		if (this.mInit) {
-			// #ifdef H5
 			this.mInit()
-			// #endif
-			// #ifdef MP-WEIXIN
-			// wxLoginFn().then(res => {
-			// 	this.mInit()
-			// })
-			// #endif
 		}
 	}
 }

ghsApp/src/pagesClient/official/index.vue

@@ -143,69 +143,16 @@ export default {
     }
 	},
   methods: {
-			...mapActions(['setUserShopAll']),
-			register(){
-					this.$util.pageTo({
-						url: '/pagesClient/official/pay',
-						query: {
-							...this.option
-						},
-						type: 2
-					})
-    },
-			experienceFun(){
-				/**姜枫 2021.04.30  小程序审核体验账号**/
-				postWxCode().then(subRes => {
-					if (util.isEmpty(subRes)) {
-						return false
-					}
-					uni.setStorageSync('token', subRes.data.token)
-					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
-					getDictionaries({ token: subRes.data.token }).then(res => {
-						if (util.isEmpty(res)) {
-							return false
-						}
-						store.commit('setDictionariesInfo', {
-							...res.data.dict,
-							...res.data
-						})
-						store.commit('setMyShopInfo', {
-							...res.data.shop,
-							...res.data
-						})
-					})
-					store.commit('setLoginInfo', {
-						...subRes.data.admin,
-						...subRes.data
-					})
-
-					//启动更新逻辑 shish 2020.5.18
-					if (subRes.data.update == 1) {
-						const updateManager = wx.getUpdateManager()
-						updateManager.onCheckForUpdate(function (res) {
-							// 请求完新版本信息的回调
-							console.log(res.hasUpdate)
-						})
-						updateManager.onUpdateReady(function () {
-							wx.showModal({
-								title: '更新提示',
-								content: '新版本已经准备好，是否重启应用？',
-								success(res) {
-									if (res.confirm) {
-										// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-										updateManager.applyUpdate()
-									}
-								}
-							})
-						})
-						updateManager.onUpdateFailed(function () {})// 新版本下载失败
-						return true;
-					}
-					getUser(true);
-					this.setUserShopAll();
-					uni.switchTab({url:'/admin/home/workbench'})
-				})
-			},
+    ...mapActions(['setUserShopAll']),
+    register(){
+        this.$util.pageTo({
+          url: '/pagesClient/official/pay',
+          query: {
+            ...this.option
+          },
+          type: 2
+        })
+    }
   },
   onLoad(props) {
     if(props.scene){

ghsApp/src/pagesClient/official/pay.vue

@@ -109,8 +109,8 @@ export default {
   background-color: #fff;
 }
 .banner-wrap {
-  padding: 32px;
-  width: calc(100% - 64px);
+  padding: 23px;
+  width: calc(100% - 30px);
   border-bottom: 20px solid $backColor;
   .banner-img {
     width: 100%;

ghsApp/src/pagesPurchase/details.vue

@@ -116,11 +116,11 @@
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">实付金额</view>
-						<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);height:70rpx;"  type="digit" :disabled="!canIEdit"  @focus="realMoney=''" v-model="realMoney" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写，留空没有费用"/>
+						<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);height:70rpx;"  type="digit" :disabled="!canIEdit"  @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写，留空没有费用"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">报损减免</view>
-						<view>{{(totalPrice - realMoney).toFixed(2) }}</view>
+						<view>{{(totalPrice - modifyPrice).toFixed(2) }}</view>
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell remark-wrap" :hover="false">
@@ -143,7 +143,7 @@
 				<text class="price-title">实付金额</text>
 				<text class="price-number">
 					<!--¥ <text class="large">{{ Number(allPrice) + Number(form.packingCharge) + Number(form.shortCharge) + Number(form.longCharge) + Number(form.pickCharge) + Number(form.localCharge) }}</text>-->
-					¥ <text class="large">{{ realMoney }}</text>
+					¥ <text class="large">{{ modifyPrice }}</text>
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" v-if="canIEdit" @click="formSubmit">
@@ -205,7 +205,7 @@ export default {
 			showCustomer: false,
 			detailsInfo: {},
 			totalPrice:0,
-			realMoney:0,
+			modifyPrice:0,
 		};
 	},
 	onLoad() {
@@ -234,14 +234,14 @@ export default {
 					}
 				}
 			}
-			this.realMoney = price.toFixed(2);
+			this.modifyPrice = price.toFixed(2);
 			return price.toFixed(2);
 		},
 		inputFn(e) {
 			let price = Number(this.selectAllPrice);
 			price = price + Number(this.form.packingCharge) + Number(this.form.shortCharge) + Number(this.form.longCharge) + Number(this.form.pickCharge) + Number(this.form.localCharge)
 			this.totalPrice = price.toFixed(2);
-			this.realMoney = price.toFixed(2);
+			this.modifyPrice = price.toFixed(2);
 
 			// return price.toFixed(2);
 		},
@@ -342,7 +342,7 @@ export default {
 				if (!this.getMerchantInfo) {
 					await this.initMerchantInfo();
 				}
-				await createPurchaseOrderApi({...formData,realPrice:this.realMoney});
+				await createPurchaseOrderApi({...formData,realPrice:this.modifyPrice});
 				uni.setStorageSync('flowersItemInfo', itemInfo);
 				this.resetSelectInfoByType(this.pageType);
 				uni.navigateTo({url:'/pagesPurchase/components/pageSuccess?title=新增成功'})

ghsApp/src/pagesPurchase/info.vue

@@ -100,6 +100,10 @@
 			</view>
 			<view class="content-box price-detail">
 				<div class="module-com input-line-wrap">
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">包装重量</div>
+						<div class="detail-price_box" style="font-size: 36rpx;">¥{{ detailInfo.packWeight }}</div>
+					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">打包费</div>
 						<div class="detail-price_box" style="font-size: 36rpx;">¥{{ detailInfo.packingCharge }}</div>
@@ -122,7 +126,15 @@
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">总金额</div>
-						<div class="detail-price_box red" style="font-size: 36rpx;">¥{{ detailInfo.orderPrice || 0.00 }}</div>
+						<div class="detail-price_box red" style="font-size: 36rpx;">¥{{ detailInfo.prePrice || 0.00 }}</div>
+					</tui-list-cell>
+					<tui-list-cell v-if="detailInfo.discountAmount > 0" class="line-cell" :hover="false">
+						<div class="tui-title">减免金额</div>
+						<div class="detail-price_box red" style="font-size: 36rpx;">¥{{ detailInfo.discountAmount || 0.00 }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">实付金额</div>
+						<div class="detail-price_box red" style="font-size: 36rpx;">¥{{ detailInfo.realPrice || 0.00 }}</div>
 					</tui-list-cell>
 				</div>
 			</view>
@@ -143,7 +155,6 @@
 				</div>
 			</view>
 		</view>
-    <kd-entrance></kd-entrance>
 	</view>
 </template>
 

ghsApp/src/pagesPurchase/order.vue

@@ -161,6 +161,7 @@ export default {
 	background-color: #f9fbfc;
 	.order-list {
 		padding-top: 20upx;
+		padding-bottom: 80upx;
 		flex: 1;
 		// padding-bottom: 50upx;
 		.allot-item {

ghsApp/src/pagesPurchase/orderItem.vue

@@ -25,7 +25,7 @@
 				</view>
 			</view>
 			<view class="item-price"
-				>¥{{ info.orderPrice }} <text class="iconfont iconxiangyou"></text>
+				>¥{{ info.realPrice }} <text class="iconfont iconxiangyou"></text>
 			</view>
 		</view>
 	</view>

hdApp/src/components/none-hd.vue

@@ -14,7 +14,6 @@
             class="experInput"
             placeholder="请输入体验码"
           />
-        <!-- <input type="text"  v-model="experCode" placeholder="请输入体验码" /> -->
         <text class="admin-button-com small blue" @click="rightClick">确定</text>
       </view>
     </view>

hdApp/src/mixins/globalMixins.js

@@ -56,7 +56,7 @@ export default {
             this.AUTHORITY_SHOW = true;
             uni.hideTabBar()
             uni.setStorageSync('HOME_STATUS_STROAGE_SHOW', res.data.shopAdminId)
-            uni.setStorageSync('HOME_REFRESH', '1')
+            uni.setStorageSync('HOME_REFRESH', '2')
           } else if (res.data.admin.openShop == '2' && res.data.shopAdminId == '0') {
             this.MODEL_TITLE = '已申请'
             this.MODEL_BTN_TEXT = '查看申请进度'
@@ -91,6 +91,12 @@ export default {
       this.MODEL_BTN_TEXT = '查看申请进度'
       this.AUTHORITY_SHOW = true
       uni.hideTabBar()
+    }
+    if (uni.getStorageSync('HOME_REFRESH') == '2') {
+      this.MODEL_TITLE = '您还没有开店哦'
+      this.MODEL_BTN_TEXT = '免费申请'
+      this.AUTHORITY_SHOW = true
+      uni.hideTabBar()
     }
 	},
 	methods: {
@@ -121,14 +127,14 @@ export default {
           }).catch(err => {})
       }
     },
-    experienceFun (val) {
-      console.log(val)
-      if (this.$util.isEmpty(val)) {
+    experienceFun (experienceCode) {
+      console.log(experienceCode)
+      if (this.$util.isEmpty(experienceCode)) {
         this.$msg('请输入体验码')
         return false
       }
       /**姜枫 2021.04.30  小程序审核体验账号**/
-      postWxCode({password: val}).then(subRes => {
+      postWxCode({experienceCode: experienceCode}).then(subRes => {
         if (this.$util.isEmpty(subRes)) {
           return false
         }
@@ -155,28 +161,7 @@ export default {
         uni.removeStorageSync('OPEN_SHOP_ID')
         this.AUTHORITY_SHOW = false
         uni.showTabBar()
-        //启动更新逻辑 shish 2020.5.18
-        if (subRes.data.update == 1) {
-          const updateManager = wx.getUpdateManager()
-          updateManager.onCheckForUpdate(function (res) {
-            // 请求完新版本信息的回调
-            console.log(res.hasUpdate)
-          })
-          updateManager.onUpdateReady(function () {
-            wx.showModal({
-              title: '更新提示',
-              content: '新版本已经准备好，是否重启应用？',
-              success(res) {
-                if (res.confirm) {
-                  // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-                  updateManager.applyUpdate()
-                }
-              }
-            })
-          })
-          updateManager.onUpdateFailed(function () {})// 新版本下载失败
-          return true;
-        }
+
         getUser(true)
         //获取门店信息
         this.setUserShopAll();
@@ -186,14 +171,7 @@ export default {
 	},
 	mounted() {
 		if (this.mInit) {
-			// #ifdef H5
 			this.mInit()
-			// #endif
-			// #ifdef MP-WEIXIN
-			// wxLoginFn().then(res => {
-			// 	this.mInit()
-			// })
-			// #endif
 		}
 	}
 }

hdApp/src/pagesClient/official/index.vue

@@ -190,61 +190,7 @@ export default {
         uni.makePhoneCall({
           phoneNumber: "05923272000"
         });
-      },
-			experienceFun(){
-				/**姜枫 2021.04.30  小程序审核体验账号**/
-				postWxCode().then(subRes => {
-					if (util.isEmpty(subRes)) {
-						return false
-					}
-					uni.setStorageSync('token', subRes.data.token)
-					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
-					getDictionaries({ token: subRes.data.token }).then(res => {
-						if (util.isEmpty(res)) {
-							return false
-						}
-						store.commit('setDictionariesInfo', {
-							...res.data.dict,
-							...res.data
-						})
-						store.commit('setMyShopInfo', {
-							...res.data.shop,
-							...res.data
-						})
-					})
-					store.commit('setLoginInfo', {
-						...subRes.data.admin,
-						...subRes.data
-					})
-
-					//启动更新逻辑 shish 2020.5.18
-					if (subRes.data.update == 1) {
-						const updateManager = wx.getUpdateManager()
-						updateManager.onCheckForUpdate(function (res) {
-							// 请求完新版本信息的回调
-							console.log(res.hasUpdate)
-						})
-						updateManager.onUpdateReady(function () {
-							wx.showModal({
-								title: '更新提示',
-								content: '新版本已经准备好，是否重启应用？',
-								success(res) {
-									if (res.confirm) {
-										// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-										updateManager.applyUpdate()
-									}
-								}
-							})
-						})
-						updateManager.onUpdateFailed(function () {})// 新版本下载失败
-						return true;
-					}
-					getUser(true)
-					//获取门店信息
-					this.setUserShopAll();
-					uni.switchTab({url:'/admin/home/workbench'})
-				})
-			},
+      }
   }
 };
 </script>

hdApp/src/pagesClient/official/pay.vue

@@ -87,8 +87,8 @@ export default {
   background-color: #fff;
 }
 .banner-wrap {
-  padding: 32px;
-  width: calc(100% - 64px);
+  padding: 23px;
+  width: calc(100% - 30px);
   border-bottom: 20px solid $backColor;
   .banner-img {
     width: 100%;