浏览代码

2023.8.16

nanMing 1 年之前
父节点
当前提交
8b1bcd81f0

+ 17 - 0
api/page.js

@@ -11,3 +11,20 @@ export function detail(pageId) {
     pageId
   })
 }
+
+
+export const wxLogin = async () => {
+    return new Promise((resolve, reject) => {
+       wx.login({
+           success: async (res) => {
+             console.log('code',res.code)
+             // let rs = await getOpenId(res.code)
+             // let openId = rs.data.openid
+             // let sessionKey = rs.data.sessionKey
+             // uni.setStorageSync('openId', openId)
+             // uni.setStorageSync('sessionKey', sessionKey)
+             // resolve(openId)
+          } 
+       })
+    })
+}

+ 14 - 2
components/page/banner/index.vue

@@ -44,10 +44,22 @@
         autoplay: true, // 是否自动切换
         duration: 800, // 滑动动画时长
         imgHeights: [], // 图片的高度
-        imgCurrent: 0 // 当前banne所在滑块指针
+        imgCurrent: 0 ,// 当前banne所在滑块指针
+				newList: [],
       };
     },
-
+		
+		watch:{
+			dataList:{
+				immediate:true,
+				handler(newData){
+					newData.map((item) => {
+						item.imgUrl = item.imgUrl.replace('http://10.16.4.7','https://www.ccsckj.com')
+						item.imgUrl = item.imgUrl.replace('http://121.36.73.159:810','https://www.ccsckj.com')
+					})
+				}
+			}
+		},
     created() {
       const app = this;
       uni.getSystemInfo({

+ 11 - 1
components/page/goods/index.vue

@@ -75,7 +75,17 @@
       params: Object,
       dataList: Array
     },
-
+		
+		watch:{
+			dataList:{
+				immediate:true,
+				handler(newData){
+					newData.map((item) => {
+						item.goods_image = item.goods_image.replace('http://www.ccsckj.com','https://www.ccsckj.com')
+					})
+				}
+			}
+		},
     /**
      * 组件的方法列表
      * 更新属性和数据的方法与更新页面数据的方法类似

+ 12 - 0
components/page/navBar/index.vue

@@ -32,6 +32,18 @@
 
     mixins: [mixin],
 
+		watch:{
+			dataList:{
+				immediate:true,
+				handler(newData){
+					newData.map((item) => {
+						item.imgUrl = item.imgUrl.replace('http://10.16.4.7','https://www.ccsckj.com')
+						item.imgUrl = item.imgUrl.replace('http://121.36.73.159:810','https://www.ccsckj.com')
+					})
+				}
+			}
+		},
+		
     /**
      * 组件的方法列表
      * 更新属性和数据的方法与更新页面数据的方法类似

+ 1 - 1
config.js

@@ -6,7 +6,7 @@ module.exports = {
   // 必填: 后端api地址, 斜杠/结尾, 参照下面格式
   // 例如: https://www.你的域名.com/index.php?s=/api/
   // apiUrl: "http://121.36.73.159:807/prod-api/",
-	apiUrl: "https://www.ccsckj.com:810/index.php?s=/api/",
+	apiUrl: "https://www.ccsckj.com/index.php?s=/api/",
   /**
    * 是否启用商城设置缓存
    * 将减少用户端重复请求; 正式运营时请设为true, 开启后商城设置同步前端需10分钟缓存

+ 1 - 0
pages/category/index.vue

@@ -117,6 +117,7 @@
        * @param {Object} result
        */
       initCategory(result) {
+				console.log(result);
         this.list = result.data.list
       },
 

+ 3 - 0
pages/checkout/index.vue

@@ -331,6 +331,9 @@
         app.order = order
         app.personal = personal
         app.setting = setting
+				app.order.goodsList.forEach((item) =>{
+					item.goods_image = item.goods_image.replace('http://','https://')
+				})
         // 显示错误信息
         if (order.hasError) {
           app.$toast(order.errorMsg)

+ 5 - 0
pages/goods/detail.vue

@@ -202,6 +202,11 @@
         return new Promise((resolve, reject) => {
           GoodsApi.detail(app.goodsId)
             .then(result => {
+							result.data.detail.goods_image = result.data.detail.goods_image.replace('http://','https://')
+							result.data.detail.goods_images.forEach((item) => {
+								item.preview_url = item.preview_url.replace('http://','https://')
+								item.external_url = item.external_url.replace('http://','https://')
+							})
               app.goods = result.data.detail
               resolve(result)
             })

+ 0 - 6
pages/index/index.vue

@@ -9,7 +9,6 @@
 	import { setCartTabBadge } from '@/core/app'
 	import * as Api from '@/api/page'
 	import Page from '@/components/page'
-	// import { homePage } from '@/common/mock.js'
 
 	const App = getApp()
 
@@ -53,11 +52,6 @@
 			getPageData(callback) {
 				const app = this
 				const pageId = app.options.pageId || 0
-				// 设置页面数据
-				// const { data: { pageData } } = homePage
-				// app.page = pageData.page
-				// app.items = pageData.items
-				// app.setPageBar();
 				// 设置顶部导航栏栏
 				Api.detail(pageId)
 					.then(result => {

+ 1 - 1
pages/login/components/mp-weixin.vue

@@ -3,7 +3,7 @@
     <view class="wechatapp">
       <view class="header">
         <!-- <open-data class="avatar" type="userAvatarUrl"></open-data> -->
-        <image class="image" :src="storeInfo && storeInfo.image_url ? storeInfo.image_url : '/static/default-avatar.png'"></image>
+        <image class="image" :src="storeInfo && storeInfo.image_url ? storeInfo.image_url.replace('http://','https://') : '/static/default-avatar.png'"></image>
       </view>
     </view>
     <view class="auth-title">申请获取以下权限</view>