版本提交

@@ -11,17 +11,17 @@ module.exports = {
   "enabledQcloud": false, //是否开启腾讯云COS 上传功能
   "enabledQcloud": false, //是否开启腾讯云COS 上传功能
   // 腾讯云COS 上传功能配置表
   // 腾讯云COS 上传功能配置表
   "qcloud": {
   "qcloud": {
-		"appid": "wxc57ed87f2569f701",
+    "appid": "wx61c217d6f1553ccc",
     "secretId": "xxx",
     "secretId": "xxx",
     "secretKey": "xxxxx",
     "secretKey": "xxxxx",
     "bucket": "xxxx",
     "bucket": "xxxx",
     "region": "sh",
     "region": "sh",
-		"prefix": "what-ever/you-want",
+    "prefix": "/weapp/marubi/wish-list",
     "overWrite": true,
     "overWrite": true,
     "headers": {
     "headers": {
       "Cache-Control": "max-age=5184000"
       "Cache-Control": "max-age=5184000"
     }
     }
   },
   },
   // 静态资源CDN 域名，配合CDN 功能实用，线上请确保在mp管理端已经注册域名
   // 静态资源CDN 域名，配合CDN 功能实用，线上请确保在mp管理端已经注册域名
-	"assetsCDN": "https://res.jianhui.org/"
+  "assetsCDN": "https://kdcdn.oss-cn-shenzhen.aliyuncs.com"
 };
 };

@@ -46,6 +46,7 @@ var paths = {
     imgFiles: 'src/image/**/*',
     imgFiles: 'src/image/**/*',
     scssFiles: 'src/**/*.scss',
     scssFiles: 'src/**/*.scss',
     baseFiles: ['src/**/*.{png,js,json,wxml,wxss,wxs,ts,woff2}', '!src/assets/**/*', '!src/image/**/*'],
     baseFiles: ['src/**/*.{png,js,json,wxml,wxss,wxs,ts,woff2}', '!src/assets/**/*', '!src/image/**/*'],
+    targetFiles: ['src/**/*.{png,js,json}', '!src/assets/**/*', '!src/image/**/*'], //modify 观察时只复制部分，baseFiles是为了涵盖其他第三方引用，如ui
     assetsDir: 'src/assets',
     assetsDir: 'src/assets',
     assetsImgFiles: 'src/assets/images/**/*.{png,jpg,jpeg,svg,gif}',
     assetsImgFiles: 'src/assets/images/**/*.{png,jpg,jpeg,svg,gif}',
     wxmlFiles: ['src/**/*.wxml'],
     wxmlFiles: ['src/**/*.wxml'],
@@ -130,7 +131,8 @@ function sassCompile() {
       'extname': '.wxss'
       'extname': '.wxss'
     }))
     }))
     .pipe(replace('.scss', '.wxss'))
     .pipe(replace('.scss', '.wxss'))
-		.pipe(replace('%ASSETS_IMG%/', res))
+    // .pipe(replace('%ASSETS_IMG%/', res))
+    .pipe(replace('../../image/oss/', res)) // 自定义图片地址
     .pipe(replace('src/assets/images', res)) // 雪碧图CSS RUL 中的图片路径
     .pipe(replace('src/assets/images', res)) // 雪碧图CSS RUL 中的图片路径
     .pipe(gulp.dest(paths.dist.baseDir))
     .pipe(gulp.dest(paths.dist.baseDir))
 }
 }
@@ -142,6 +144,12 @@ function copyBasicFiles() {
     .pipe(gulp.dest(paths.dist.baseDir));
     .pipe(gulp.dest(paths.dist.baseDir));
 }
 }
 
 
+// 复制基础文件 modify
+function copyTargetFiles() {
+  return gulp.src(paths.src.targetFiles, {})
+    .pipe(gulp.dest(paths.dist.baseDir));
+}
+
 // 复制 WXML
 // 复制 WXML
 function copyWXML() {
 function copyWXML() {
   return gulp.src(paths.src.wxmlFiles, {})
   return gulp.src(paths.src.wxmlFiles, {})
@@ -154,7 +162,8 @@ function wxmlImgRewrite() {
   var res = config.assetsCDN + config.qcloud.prefix + '/';
   var res = config.assetsCDN + config.qcloud.prefix + '/';
   // console.log(res);
   // console.log(res);
   return gulp.src(paths.src.wxmlFiles)
   return gulp.src(paths.src.wxmlFiles)
-		.pipe(replace('%ASSETS_IMG%/', res))
+    // .pipe(replace('%ASSETS_IMG%/', res))
+    .pipe(replace('../../image/oss/', res))
     .pipe(gulp.dest(paths.dist.baseDir))
     .pipe(gulp.dest(paths.dist.baseDir))
 }
 }
 
 
@@ -233,7 +242,8 @@ var watchHandler = function (type, file) {
       var tmp = file.replace('src/', 'dist/');
       var tmp = file.replace('src/', 'dist/');
       del([tmp]);
       del([tmp]);
     } else {
     } else {
-			copyBasicFiles();
+      copyTargetFiles(); // modify
+      // copyBasicFiles();
       // copyWXML();
       // copyWXML();
       // wxmlImgRewrite();
       // wxmlImgRewrite();
     }
     }

 {
 {
   "pages": [
   "pages": [
+    "pages/index/index",
     "pages/prize-detail/prize-detail",
     "pages/prize-detail/prize-detail",
     "pages/user-table/user-table",
     "pages/user-table/user-table",
-    "pages/index/index",
     "pages/authorize/authorize",
     "pages/authorize/authorize",
     "pages/coop/coop",
     "pages/coop/coop",
     "pages/register/register",
     "pages/register/register",

@@ -116,3 +116,15 @@
 .van-popup {
 .van-popup {
   background-color: transparent !important;
   background-color: transparent !important;
 }
 }
+
+
+button {
+  border: none;
+  margin: 0;
+  padding: 0;
+}
+
+button::after {
+  border: none;
+}
+

@@ -166,14 +166,15 @@ Page({
           y: 0,
           y: 0,
           url: '../../image/draw/draw-c1.png',
           url: '../../image/draw/draw-c1.png',
         },
         },
-        // // 头像
-        // {
-        //   width: 102,
-        //   height: 102,
-        //   x: 35,
-        //   y: 700,
-        //   url: userInfo.avatar,
-        // },
+        // 头像
+        {
+          width: 102,
+          height: 102,
+          x: 35,
+          y: 779,
+          borderRadius: 102,
+          url: userInfo.avatar,
+        },
         // 小程序码
         // 小程序码
         {
         {
           width: 118,
           width: 118,