diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..43da0a2 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/api/request.ts b/api/request.ts index a4c63e5..219aee6 100644 --- a/api/request.ts +++ b/api/request.ts @@ -1,3 +1,5 @@ -export const baseUrl = 'http://localhost:9092/api' //后端接口文档 +export const Url = 'http://localhost:9092/api' //后端接口文档 export const testUrl = 'http://123.249.108.160:8888/api' //自己组的服务器接口地址 -export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址 \ No newline at end of file +export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址 + +export const baseUrl = testUrl \ No newline at end of file diff --git a/manifest.json b/manifest.json index 49dc1a3..83dab4b 100644 --- a/manifest.json +++ b/manifest.json @@ -50,9 +50,10 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 小程序特有相关 */ - "appid" : "wx3f968a09e31d6bed", + "appid" : "wx61b63e27bddf4ea2", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "minified" : true }, "usingComponents" : true }, diff --git a/pages.json b/pages.json index 485844f..722f957 100644 --- a/pages.json +++ b/pages.json @@ -61,7 +61,7 @@ "path" : "pages/store-home/ProductDetails/ProductDetails", "style" : { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "泠泷水月阁工作室" } }, { @@ -114,13 +114,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/order/paysuccess/paysuccess", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path": "pages/booking/Simple/Simple", "style": { @@ -134,13 +127,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/order/productOrderDetail/productOrderDetail", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/login/login", "style" : @@ -196,6 +182,20 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/workshop/productmain/productmain", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/workshop/component/timePopUp", + "style" : + { + "navigationBarTitleText" : "" + } } ], "globalStyle": { @@ -208,30 +208,26 @@ } }, "tabBar": { - "backgroundColor": "#F7E7C6", + "backgroundColor": "#FFFFFF", "list": [ { "pagePath": "pages/home/home", "iconPath": "./static/home.png", - "selectedIconPath": "./static/homeselected.png", "text":"首页" }, { "pagePath": "pages/store-home/main/main", "iconPath": "./static/store.png", - "selectedIconPath": "./static/storeselected.png", "text":"商城" }, { "pagePath": "pages/Shopping-cart/productmain/productmain", "iconPath": "./static/shopcar.png", - "selectedIconPath": "./static/shopcarselected.png", "text":"购物车" }, { "pagePath": "pages/mine/main/main", "iconPath": "./static/mine.png", - "selectedIconPath": "./static/mineselected.png", "text":"我的" } ] diff --git a/pages/Shopping-cart/newaddress_Info/img/dingwei.png b/pages/Shopping-cart/newaddress_Info/img/dingwei.png deleted file mode 100644 index 42904d6..0000000 Binary files a/pages/Shopping-cart/newaddress_Info/img/dingwei.png and /dev/null differ diff --git a/pages/Shopping-cart/newaddress_Info/img/selected.png b/pages/Shopping-cart/newaddress_Info/img/selected.png deleted file mode 100644 index 52a1349..0000000 Binary files a/pages/Shopping-cart/newaddress_Info/img/selected.png and /dev/null differ diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue index 96f47c4..1029029 100644 --- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue +++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue @@ -48,8 +48,6 @@ import {ref , onMounted} from 'vue' import { testUrl , baseUrl , suiUrl } from '../../../api/request'; import { onLoad } from '@dcloudio/uni-app'; -import dingwei from '@/pages/Shopping-cart/newaddress_Info/img/dingwei.png' -import selected from '@/pages/Shopping-cart/newaddress_Info/img/selected.png' const userInfo = ref({}) const addressParam = ref({ userId: 0, diff --git a/pages/Shopping-cart/productmain/img/add.png b/pages/Shopping-cart/productmain/img/add.png deleted file mode 100644 index 7f1530a..0000000 Binary files a/pages/Shopping-cart/productmain/img/add.png and /dev/null differ diff --git a/pages/Shopping-cart/productmain/img/choose.png b/pages/Shopping-cart/productmain/img/choose.png deleted file mode 100644 index 5b700ad..0000000 Binary files a/pages/Shopping-cart/productmain/img/choose.png and /dev/null differ diff --git a/pages/Shopping-cart/productmain/img/choosed.png b/pages/Shopping-cart/productmain/img/choosed.png deleted file mode 100644 index 8d36d1f..0000000 Binary files a/pages/Shopping-cart/productmain/img/choosed.png and /dev/null differ diff --git a/pages/Shopping-cart/productmain/img/productimg.png b/pages/Shopping-cart/productmain/img/productimg.png deleted file mode 100644 index 1ddfcae..0000000 Binary files a/pages/Shopping-cart/productmain/img/productimg.png and /dev/null differ diff --git a/pages/Shopping-cart/productmain/img/pull.png b/pages/Shopping-cart/productmain/img/pull.png deleted file mode 100644 index b4410ee..0000000 Binary files a/pages/Shopping-cart/productmain/img/pull.png and /dev/null differ diff --git a/pages/Shopping-cart/productmain/img/rmb.png b/pages/Shopping-cart/productmain/img/rmb.png deleted file mode 100644 index cc3c40f..0000000 Binary files a/pages/Shopping-cart/productmain/img/rmb.png and /dev/null differ diff --git a/pages/Shopping-cart/productmain/img/short.png b/pages/Shopping-cart/productmain/img/short.png deleted file mode 100644 index 4db3f01..0000000 Binary files a/pages/Shopping-cart/productmain/img/short.png and /dev/null differ diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue index e2deb4f..6ab8d21 100644 --- a/pages/Shopping-cart/productmain/productmain.vue +++ b/pages/Shopping-cart/productmain/productmain.vue @@ -133,14 +133,6 @@ import { ref , onMounted} from 'vue' import { onShow } from "@dcloudio/uni-app"; import { baseUrl , testUrl ,suiUrl} from '../../../api/request'; -//本地图片 -import product_img from '@/pages/Shopping-cart/productmain/img/productimg.png'; -import add from '@/pages/Shopping-cart/productmain/img/add.png'; -import choose from '@/pages/Shopping-cart/productmain/img/choose.png'; -import choosed from '@/pages/Shopping-cart/productmain/img/choosed.png'; -import pull from '@/pages/Shopping-cart/productmain/img/pull.png'; -import rmb from '@/pages/Shopping-cart/productmain/img/rmb.png'; -import short from '@/pages/Shopping-cart/productmain/img/short.png'; const products = ref([]) const current = ref(1) //用于判断是实体类商品还是服务类商品 const allCheck = ref(false) //全选 diff --git a/pages/home/home.vue b/pages/home/home.vue index d985c44..5ef96e8 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -1,135 +1,51 @@ @@ -138,14 +54,6 @@ import {ref} from 'vue' import { baseUrl, testUrl , suiUrl} from '@/api/request'; import { onShow } from "@dcloudio/uni-app"; -import dec from '@/pages/home/img/dec.png' -import product from '@/pages/home/img/product.png' -import right from '@/pages/home/img/right.png' -import left from '@/pages/home/img/left.png' -import rili from '@/pages/home/img/rili.png' -import xuanchuan from '@/pages/home/img/xuanchuan.png' -import shizi from '@/pages/home/img/shizi.png' -import you from '@/pages/home/img/you.png' //变量 const items = ref( [null, null, null]) const items_1 = ref( [null, null, null]) @@ -153,11 +61,6 @@ onShow(() => { uni.removeStorageSync('businessId') getMyUser() }) -const jump_feiyi =()=>{ - uni.navigateTo({ - url: '/pages/workshop/index/index' - }) -} const getMyUser = async () =>{ const res = await uni.request({ url: baseUrl + '/user/get/login', @@ -178,219 +81,181 @@ const getMyUser = async () =>{ }) } } -//跳转商品详情页面 -const jump_product =()=>{ - uni.navigateTo({ - url:'../../pages/store-home/ProductDetails/ProductDetails' - }) -} const jump_xiezhen =()=>{ uni.navigateTo({ url: '../../pages/booking/respectable/respectable' }) } +const jump_feiyi =()=>{ //跳转非遗工坊 + uni.navigateTo({ + url: '/pages/workshop/index/index' + }) +} +const jump_store =()=>{ + uni.switchTab({ + url: '/pages/store-home/main/main' + }) +} \ No newline at end of file diff --git a/pages/order/product-waitpay/img/add.png b/pages/order/product-waitpay/img/add.png deleted file mode 100644 index 0b3310f..0000000 Binary files a/pages/order/product-waitpay/img/add.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/dingwei.png b/pages/order/product-waitpay/img/dingwei.png deleted file mode 100644 index f09812a..0000000 Binary files a/pages/order/product-waitpay/img/dingwei.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/product.png b/pages/order/product-waitpay/img/product.png deleted file mode 100644 index f7b1566..0000000 Binary files a/pages/order/product-waitpay/img/product.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/rmb_32.png b/pages/order/product-waitpay/img/rmb_32.png deleted file mode 100644 index 015faa7..0000000 Binary files a/pages/order/product-waitpay/img/rmb_32.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/rmb_36px.png b/pages/order/product-waitpay/img/rmb_36px.png deleted file mode 100644 index 60e9daf..0000000 Binary files a/pages/order/product-waitpay/img/rmb_36px.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/rmb_cheng.png b/pages/order/product-waitpay/img/rmb_cheng.png deleted file mode 100644 index b176eea..0000000 Binary files a/pages/order/product-waitpay/img/rmb_cheng.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/rmb_huang.png b/pages/order/product-waitpay/img/rmb_huang.png deleted file mode 100644 index a780003..0000000 Binary files a/pages/order/product-waitpay/img/rmb_huang.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/short.png b/pages/order/product-waitpay/img/short.png deleted file mode 100644 index 51481c5..0000000 Binary files a/pages/order/product-waitpay/img/short.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/yiwen.png b/pages/order/product-waitpay/img/yiwen.png deleted file mode 100644 index 654306a..0000000 Binary files a/pages/order/product-waitpay/img/yiwen.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/you_cheng.png b/pages/order/product-waitpay/img/you_cheng.png deleted file mode 100644 index 96adf0d..0000000 Binary files a/pages/order/product-waitpay/img/you_cheng.png and /dev/null differ diff --git a/pages/order/product-waitpay/img/you_hei.png b/pages/order/product-waitpay/img/you_hei.png deleted file mode 100644 index 871a146..0000000 Binary files a/pages/order/product-waitpay/img/you_hei.png and /dev/null differ diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue index 2e32add..e923396 100644 --- a/pages/order/product-waitpay/product-waitpay.vue +++ b/pages/order/product-waitpay/product-waitpay.vue @@ -10,7 +10,7 @@ {{ addressRealInfo.detailAddress }} @@ -18,7 +18,7 @@ 更换地址 @@ -58,7 +58,7 @@ @@ -66,7 +66,7 @@ @@ -78,7 +78,7 @@ @@ -126,7 +126,7 @@ {{ sumprice }}.00 @@ -144,7 +144,7 @@ 应付： {{ sumprice }}. @@ -166,19 +166,6 @@ import {onMounted, ref, toRaw} from 'vue' import emitter from '../../../utils/emitter' import { onLoad , onShow } from "@dcloudio/uni-app"; import { baseUrl } from '../../../api/request'; -//图片暂时存在本地 -import addressComponentVue from '../component/addressComponent.vue'; //带入组件 -import add from '@/pages/order/product-waitpay/img/add.png'; -import dingwei from '@/pages/order/product-waitpay/img/dingwei.png'; -import product from '@/pages/order/product-waitpay/img/product.png'; -import rmb_32 from '@/pages/order/product-waitpay/img/rmb_32.png'; -import rmb_36px from '@/pages/order/product-waitpay/img/rmb_36px.png'; -import rmb_cheng from '@/pages/order/product-waitpay/img/rmb_cheng.png'; -import rmb_huang from '@/pages/order/product-waitpay/img/rmb_huang.png'; -import short from '@/pages/order/product-waitpay/img/short.png'; -import yiwen from '@/pages/order/product-waitpay/img/yiwen.png'; -import you_cheng from '@/pages/order/product-waitpay/img/you_cheng.png'; -import you_hei from '@/pages/order/product-waitpay/img/you_hei.png'; //一些暂时变量 const num = ref(1) const price = ref(138) diff --git a/pages/order/productOrderDetail/productOrderDetail.vue b/pages/order/productOrderDetail/productOrderDetail.vue deleted file mode 100644 index bb643a0..0000000 --- a/pages/order/productOrderDetail/productOrderDetail.vue +++ /dev/null @@ -1,489 +0,0 @@ - - - - - diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue index 2032032..4ab7bc8 100644 --- a/pages/store-home/ProductDetails/ProductDetails.vue +++ b/pages/store-home/ProductDetails/ProductDetails.vue @@ -1,113 +1,69 @@