鲜花

mallApp/src/pages/home/category.vue

@@ -59,6 +59,14 @@ export default {
   onLoad: function () {
     uni.hideTabBar()
   },
+  onShareAppMessage(res) {
+		console.log("pages/home/category?account="+this.option.account)
+		return {
+			title: '花束',
+			desc: "",
+			path: "pages/home/category?account="+this.option.account,
+		}
+	},
   methods: {
     init(){
       this.sInit()

mallApp/src/pages/home/recent.vue

@@ -27,7 +27,7 @@
               <view class="box_9">
                 <view class="tag_2" @click="showTip()"> <text>待结订单</text> </view>
                 <view class="tag_2" @click="showTip()"> <text>结账记录</text> </view>
-                <view class="tag_2" @click="showTip()"> <text>买花记录</text> </view>
+                <view class="tag_2" @click="getBuyList()"> <text>买花记录</text> </view>
               </view>
               <view class="button_4 flex-col" @click="bugHs(item)"><text class="text_13">买花束</text></view>
               <view class="button_5 flex-col" @click="bugFlower(item)"><text class="text_13">买鲜花</text></view>
@@ -124,6 +124,9 @@ export default {
   onLoad () {
   },
   methods: {
+    getBuyList(){
+      this.pageTo({ url:'/pages/order/list'})
+    },
     showTip(){
       this.$msg('开发中')
     },

mallApp/src/pages/item/item.vue

@@ -91,7 +91,6 @@ import ModalModule from "@/components/item/plugin/modal";
 import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
 import productMins from "@/mixins/cgProduct";
 import { COMMODITY_TYPE } from "@/utils/declare";
-import { mapGetters } from "vuex";
 export default {
 	name: "ghsProduct",
 	components: {
@@ -100,7 +99,12 @@ export default {
 		AppWrapperEmpty,
 		Commondity,
 		ModalModule,
-		FooterCart,allMoreSelectInput,PxClassCommondity,GoodsCommondity,wangCg,SelPopup,AppActivilyCoupon
+		FooterCart,
+		allMoreSelectInput,
+		PxClassCommondity,
+		GoodsCommondity,
+		wangCg,SelPopup,
+		AppActivilyCoupon
 	},
 	props: {
 		ghsShopAdminId:{
@@ -153,6 +157,14 @@ export default {
 	},
 	watch: {
 		
+	},
+  	onShareAppMessage(res) {
+		console.log("pages/item/item?account="+this.option.account)
+		return {
+			title: '鲜花',
+			desc: "",
+			path: "pages/item/item?account="+this.option.account,
+		}
 	},
 	onShow(){
 		if(this.xjData.hasUpdate == 1){

mallApp/src/pages/login/index.vue

@@ -46,16 +46,17 @@ export default {
 
 	},
     confirmFn() {
-		let currentMiniOpenId = uni.getStorageSync('miniOpenId')
-		let that = this
-		create({miniOpenId:currentMiniOpenId,...this.form}).then(res => {
-			if(res.code == 1){
-				if(res.data.info && !that.$util.isEmpty(res.data.info)){
-					store.commit('setLoginInfo', res.data.info)
-					that.$util.pageTo({url: "/pages/login/result",type:2})
-				}
-			}
-		})
+      let currentMiniOpenId = uni.getStorageSync('miniOpenId')
+      let that = this
+      create({miniOpenId:currentMiniOpenId,...this.form}).then(res => {
+        if(res.code == 1){
+          uni.setStorageSync('token', res.data.token)
+          if(res.data.user && !that.$util.isEmpty(res.data.user)){
+            store.commit('setLoginInfo', res.data.user)
+            that.$util.pageTo({url: "/pages/login/result",type:2})
+          }
+        }
+      })
     },
     formSubmit(e) {
       let rules = [

mallApp/src/pages/login/result.vue

@@ -16,6 +16,10 @@
           <button class="button-com default" style="width:220upx;" @click="lookMall">继续买花</button>
         </view>
 
+        <view style="margin-top:50upx;">
+          <button class="button-com default" style="width:220upx;" @click="goBack()">返回</button>
+        </view>
+
       </view>
     </view>
   </view>
@@ -36,6 +40,9 @@ export default {
     openSuperWx(){
 			uni.previewImage({ urls: [this.superWx] })
     },
+    goBack(){
+      uni.navigateBack({})
+    },
     lookMall(){
       this.$util.pageTo({ url: "/pages/item/item?account="+this.account, type: 2})
     },